X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/bbb34abf53d0fad71c3276985e1c7c8ab526f15d..69b85c9e1af02bcf07222b50ffbe83781b6027b2:/CMakeLists.txt?ds=sidebyside

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0675352b78..f889b7f560 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -14,10 +14,11 @@ find_path(GCOV_PATH NAMES gcov PATHS NO_DEFAULT_PATHS)
 find_path(VALGRIND_PATH	NAMES valgrind	PATHS NO_DEFAULT_PATHS)
 
 ### AUTO DETECT THE PROJECT_DIRECTORY
-exec_program("${PWD_EXE}" ARGS "| ${SED_EXE} 's/\\/Cmake//g'" OUTPUT_VARIABLE PROJECT_DIRECTORY)
+message("Project_BINARY_DIR   : ${Project_BINARY_DIR}")
+message("CMAKE_HOME_DIRECTORY : ${CMAKE_HOME_DIRECTORY}")
 
 ### SET THE PROJECT_DIRECTORY
-#SET(PROJECT_DIRECTORY "/home/navarrop/Bureau/simgrid-trunk")
+SET(PROJECT_DIRECTORY "${CMAKE_HOME_DIRECTORY}")
 
 ### Set some variables for Cmake
 SET(PROJECT_SOURCE_DIRECTORY "${PROJECT_DIRECTORY}/src")
@@ -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
@@ -61,9 +61,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)
+
+