X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/7a8207992d6e3fb13af3d4bc5777ddc1458b0592..1edd6e190e4e5202e4d055f9790bd2a3ac28f170:/CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7f4bbbe349..0cb1bd6570 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -26,9 +26,11 @@ 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})
 
-add_definitions (${INCLUDES})
+
 if(enable_coverage)
-	add_definitions (-fprofile-arcs -ftest-coverage)
+	add_definitions (${INCLUDES} -fprofile-arcs -ftest-coverage)
+else(enable_coverage)
+	add_definitions (${INCLUDES})
 endif(enable_coverage)
 
 ### Setup Options
@@ -40,7 +42,7 @@ include(${PROJECT_DIRECTORY}/buildtools/Cmake/src/CMakeCompleteInFiles.txt)
 ### Define source packages for Libs 
 include(${PROJECT_DIRECTORY}/buildtools/Cmake/src/CMakeDefinePackages.txt)
 
-include(${PROJECT_DIRECTORY}/buildtools/Cmake/src/CMakeFLEXml.txt)
+include(${PROJECT_DIRECTORY}/buildtools/Cmake/src/CMakeMaintainerMode.txt)
 
 ### Setup gcc flags
 include(${PROJECT_DIRECTORY}/buildtools/Cmake/src/CMakeFlags.txt)
@@ -50,9 +52,6 @@ include(${PROJECT_DIRECTORY}/buildtools/Cmake/src/CMakeMakeExeLib.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
@@ -61,9 +60,10 @@ include(${PROJECT_DIRECTORY}/buildtools/Cmake/src/CMakeDistrib.txt)
 ### Print ARGS
 include(${PROJECT_DIRECTORY}/buildtools/Cmake/src/CMakePrintArgs.txt)
 
-### Make Docs
-if(enable_maintainer_mode)
-	include(${PROJECT_DIRECTORY}/buildtools/Cmake/src/CMakeDocs.txt)
-endif(enable_maintainer_mode)
+set_property(GLOBAL PROPERTY LABELS "${SVN_VERSION}${GIT_VERSION}")
+set_property(GLOBAL PROPERTY PROJECT_LABEL "${SVN_VERSION}${GIT_VERSION}")
+set(PROJECT_LABEL "${SVN_VERSION}${GIT_VERSION}")
 
 INCLUDE(Dart)
+
+