Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
C
chaosframework
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Container Registry
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
chaos-lnf-control
chaosframework
Commits
4df259da
Commit
4df259da
authored
6 years ago
by
Claudio Bisegni
Browse files
Options
Downloads
Patches
Plain Diff
readd google gpt external project
parent
402e5ff1
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
CMakeLists.txt
+2
-4
2 additions, 4 deletions
CMakeLists.txt
config/CMakeChaos.txt
+32
-15
32 additions, 15 deletions
config/CMakeChaos.txt
with
34 additions
and
19 deletions
CMakeLists.txt
+
2
−
4
View file @
4df259da
cmake_minimum_required
(
VERSION 2.8
)
include
(
config/CMakeChaos.txt
)
project
(
chaosframework
)
include
(
ExternalProject
)
include
(
config/CMakeChaos.txt
)
#include(ExternalProject)
#include(CTest)
#find git
find_package
(
Git REQUIRED
)
...
...
@@ -14,7 +13,6 @@ unset(CMAKE_CXX_COMPILER_WORKS)
#specify option
option
(
CHAOS_ONLY_DEPENDECY
"Download all the dependency"
OFF
)
option
(
CHAOS_ARCHITECTURE_TEST
"Architecture tests"
OFF
)
option
(
USE_GPT
"Uses Google Performance tool to perform analisys"
OFF
)
option
(
CLING_VIRTUAL_MACHINE_ENABLE
"Enable cling for scripting"
OFF
)
option
(
CHAOS_CDS
"Chaos Data Service"
ON
)
option
(
CHAOS_MDS
"Chaos MetaData Service"
ON
)
...
...
This diff is collapsed.
Click to expand it.
config/CMakeChaos.txt
+
32
−
15
View file @
4df259da
cmake_minimum_required(VERSION 2.8)
include(${CMAKE_CURRENT_LIST_DIR}/CMakeMacroUtils.txt)
include(ExternalProject)
### options and configuration variables ####
...
...
@@ -33,6 +34,7 @@ ENDIF()
ENDIF()
option(USE_GPT "Uses Google Performance tool to perform analisys" OFF)
option(CHAOS_FORCE32 "Set to ON to enable 32 bit compilation" OFF)
option(CHAOS_STATIC "Set static compilation" OFF)
option(ENABLE_MEMCACHE "Enable Memcacahe" OFF)
...
...
@@ -58,6 +60,7 @@ ENDIF()
ADD_DEFINITIONS(-DCSLIB_VERSION_MINOR="${CHAOS_VERSION_MINOR}")
ADD_DEFINITIONS(-DCSLIB_BUILD_ID=${CHAOS_BUILD_ID})
if(CMAKE_BUILD_TYPE MATCHES PROFILE)
MESG("ENABLING PROFILE")
set (CHAOS_CXX_FLAGS "${CHAOS_CXX_FLAGS} -g -fprofile-arcs -ftest-coverage")
...
...
@@ -141,9 +144,6 @@ ENDIF()
ENDIF()
IF (CHAOS_TARGET)
IF(${CHAOS_TARGET} MATCHES "armhf")
...
...
@@ -207,9 +207,9 @@ ENDIF()
IF(NOT CMAKE_CXX_COMPILER)
project(config)
ENDIF()
if(CHAOS_BOOST_DYNAMIC)
SET(CHAOS_CXX_FLAGS "${CHAOS_CXX_FLAGS} -DBOOST_LOG_DYN_LINK")
SET(CHAOS_CXX_FLAGS "${CHAOS_CXX_FLAGS} -DBOOST_LOG_DYN_LINK")
SET(CHAOS_BOOST_FLAGS ${CHAOS_BOOST_FLAGS} link=shared runtime-link=shared)
ELSE()
SET(CHAOS_BOOST_FLAGS ${CHAOS_BOOST_FLAGS} link=static runtime-link=static)
...
...
@@ -218,7 +218,7 @@ ENDIF()
SET(CHAOS_BOOST_FLAGS ${CHAOS_BOOST_FLAGS} linkflags=\""${CHAOS_LINKER_FLAGS}"\")
ENDIF()
# SET(CHAOS_BOOST_FLAGS ${CHAOS_BOOST_FLAGS} cxxflags=\""${CHAOS_CXX_FLAGS} ${BOOST_CXX_ADDITIONAL_FLAGS}"\" --prefix=${CMAKE_INSTALL_PREFIX} --with-program_options --with-exception --with-chrono --with-filesystem --with-log --with-regex --with-random --with-system --with-thread --with-atomic --with-timer install "-j ${PROCESSOR_COUNT}" )
SET(CHAOS_BOOST_FLAGS ${CHAOS_BOOST_FLAGS} cxxflags=\""${CHAOS_CXX_FLAGS}"\" --prefix=${CMAKE_INSTALL_PREFIX} --with-program_options --with-exception --with-chrono --with-filesystem --with-log --with-regex --with-random --with-system --with-thread --with-atomic --with-timer install "-j ${PROCESSOR_COUNT}" )
...
...
@@ -299,13 +299,6 @@ ENDIF()
#set(FrameworkLib $ENV{CHAOS_LINK_LIBRARY})
#separate_arguments(FrameworkLib)
INCLUDE_DIRECTORIES(. ${PROJECT_SOURCE_DIR} ${CMAKE_INSTALL_PREFIX}/include)
LINK_DIRECTORIES(${CMAKE_LIBRARY_OUTPUT_DIRECTORY} ${CMAKE_INSTALL_PREFIX}/lib)
...
...
@@ -323,8 +316,6 @@ ENDIF()
# ENDIF()
# ENDFOREACH()
IF (DEFINED PROJECT_NAME)
FILE(GLOB conf_src conf/*)
FILE(GLOB perf_src perf/*)
...
...
@@ -379,3 +370,29 @@ ENDIF()
endif()
IF (USE_GPT)
#google performance tools
MESG("Add Google Performance Tools as external project")
ExternalProject_Add(
google_pt
GIT_REPOSITORY https://github.com/gperftools/gperftools.git
GIT_TAG master
PREFIX "${CMAKE_BINARY_DIR}/ext_dep/gpt-prefix"
SOURCE_DIR "${CMAKE_BINARY_DIR}/ext_dep/gpt-src"
BINARY_DIR "${CMAKE_BINARY_DIR}/ext_dep/gpt-src"
CONFIGURE_COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/ext_dep/gpt-src/./autogen.sh COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/ext_dep/gpt-src/./configure --prefix=${CMAKE_INSTALL_PREFIX}
LOG_DOWNLOAD ON
LOG_CONFIGURE ON
LOG_BUILD ON)
# Specify include dir
ExternalProject_Get_Property(google_pt source_dir)
set(GPT_INCLUDE_DIR ${google_pt_sdir}/include)
# Library
ExternalProject_Get_Property(google_pt binary_dir)
set(GPT_LIBRARY_DIR ${google_pt_bdir})
MESG("${GPT_INCLUDE_DIR}")
MESG("${GPT_LIBRARY_DIR}")
ENDIF()
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment