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
Patch for debian.
[simgrid.git]
/
CMakeLists.txt
diff --git
a/CMakeLists.txt
b/CMakeLists.txt
index
61ff0dc
..
f889b7f
100644
(file)
--- 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
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 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")
### Set some variables for Cmake
SET(PROJECT_SOURCE_DIRECTORY "${PROJECT_DIRECTORY}/src")
@@
-26,7
+27,12
@@
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)
+
+if(enable_coverage)
+ add_definitions (${INCLUDES} -fprofile-arcs -ftest-coverage)
+else(enable_coverage)
+ add_definitions (${INCLUDES})
+endif(enable_coverage)
### Setup Options
include(${PROJECT_DIRECTORY}/buildtools/Cmake/src/CMakeOption.txt)
### Setup Options
include(${PROJECT_DIRECTORY}/buildtools/Cmake/src/CMakeOption.txt)
@@
-37,7
+43,7
@@
include(${PROJECT_DIRECTORY}/buildtools/Cmake/src/CMakeCompleteInFiles.txt)
### Define source packages for Libs
include(${PROJECT_DIRECTORY}/buildtools/Cmake/src/CMakeDefinePackages.txt)
### Define source packages for Libs
include(${PROJECT_DIRECTORY}/buildtools/Cmake/src/CMakeDefinePackages.txt)
-include(${PROJECT_DIRECTORY}/buildtools/Cmake/src/CMake
FLEXml
.txt)
+include(${PROJECT_DIRECTORY}/buildtools/Cmake/src/CMake
MaintainerMode
.txt)
### Setup gcc flags
include(${PROJECT_DIRECTORY}/buildtools/Cmake/src/CMakeFlags.txt)
### Setup gcc flags
include(${PROJECT_DIRECTORY}/buildtools/Cmake/src/CMakeFlags.txt)
@@
-55,7
+61,10
@@
include(${PROJECT_DIRECTORY}/buildtools/Cmake/src/CMakeDistrib.txt)
### Print ARGS
include(${PROJECT_DIRECTORY}/buildtools/Cmake/src/CMakePrintArgs.txt)
### Print ARGS
include(${PROJECT_DIRECTORY}/buildtools/Cmake/src/CMakePrintArgs.txt)
-### Make Docs
-include(${PROJECT_DIRECTORY}/buildtools/Cmake/src/CMakeDocs.txt)
+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)
INCLUDE(Dart)
+
+