A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
xbt_dict: allow to have integer key and data
[simgrid.git]
/
CMakeLists.txt
diff --git
a/CMakeLists.txt
b/CMakeLists.txt
index
61ff0dc
..
d3272c1
100644
(file)
--- a/
CMakeLists.txt
+++ b/
CMakeLists.txt
@@
-26,7
+26,10
@@
set(LIBRARY_OUTPUT_PATH "${PROJECT_DIRECTORY}/src/.libs")
set(INCLUDES "-I${PROJECT_DIRECTORY}/include -I${PROJECT_DIRECTORY}/src/include -I${PROJECT_DIRECTORY}/src -I/usr/include/ -L${gtnets_path}/lib")
set(CMAKE_SOURCE_DIR ${PROJECT_SOURCE_DIRECTORY})
set(INCLUDES "-I${PROJECT_DIRECTORY}/include -I${PROJECT_DIRECTORY}/src/include -I${PROJECT_DIRECTORY}/src -I/usr/include/ -L${gtnets_path}/lib")
set(CMAKE_SOURCE_DIR ${PROJECT_SOURCE_DIRECTORY})
-add_definitions (${INCLUDES} -fprofile-arcs -ftest-coverage)
+add_definitions (${INCLUDES})
+if(enable_coverage)
+ add_definitions (-fprofile-arcs -ftest-coverage)
+endif(enable_coverage)
### Setup Options
include(${PROJECT_DIRECTORY}/buildtools/Cmake/src/CMakeOption.txt)
### Setup Options
include(${PROJECT_DIRECTORY}/buildtools/Cmake/src/CMakeOption.txt)
@@
-47,6
+50,9
@@
include(${PROJECT_DIRECTORY}/buildtools/Cmake/src/CMakeMakeExeLib.txt)
### Make tests
include(${PROJECT_DIRECTORY}/buildtools/Cmake/src/CMakeTest.txt)
### Make tests
include(${PROJECT_DIRECTORY}/buildtools/Cmake/src/CMakeTest.txt)
+if(enable_memcheck)
+ include(${PROJECT_DIRECTORY}/buildtools/Cmake/src/memcheck_tests.txt)
+endif(enable_memcheck)
include(${PROJECT_DIRECTORY}/buildtools/Cmake/src/CTestConfig.cmake)
### Setup the distrib
include(${PROJECT_DIRECTORY}/buildtools/Cmake/src/CTestConfig.cmake)
### Setup the distrib
@@
-56,6
+62,8
@@
include(${PROJECT_DIRECTORY}/buildtools/Cmake/src/CMakeDistrib.txt)
include(${PROJECT_DIRECTORY}/buildtools/Cmake/src/CMakePrintArgs.txt)
### Make Docs
include(${PROJECT_DIRECTORY}/buildtools/Cmake/src/CMakePrintArgs.txt)
### Make Docs
-include(${PROJECT_DIRECTORY}/buildtools/Cmake/src/CMakeDocs.txt)
+if(enable_maintainer_mode)
+ #include(${PROJECT_DIRECTORY}/buildtools/Cmake/src/CMakeDocs.txt)
+endif(enable_maintainer_mode)
INCLUDE(Dart)
INCLUDE(Dart)