further improvement of ChangeLog. Everything should be documented now

[simgrid.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0675352..67a181e 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,6 +1,7 @@
 cmake_minimum_required(VERSION 2.6)
 SET(CMAKE_LANGUAGE "Cxx")
 SET(PROJECT_NAME "Simgrid")
+set_property(GLOBAL PROPERTY Label "${SVN_VERSION}${GIT_VERSION}")
 
 ### Find programs and paths
 find_program(SH_EXE NAMES sh)
@@ -26,9 +27,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
@@ -50,9 +53,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