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
Use C++ style comments to fix doxygen output.
[simgrid.git]
/
CMakeLists.txt
diff --git
a/CMakeLists.txt
b/CMakeLists.txt
index
621f9f6
..
e90ed43
100644
(file)
--- a/
CMakeLists.txt
+++ b/
CMakeLists.txt
@@
-4,7
+4,7
@@
if(WIN32)
SET(CMAKE_RC_COMPILER "windres")
endif()
project(SimGrid C)
SET(CMAKE_RC_COMPILER "windres")
endif()
project(SimGrid C)
-if (enable_gtnets OR enable_ns3)
+if (enable_gtnets OR enable_ns3
OR enable_model-checking
)
enable_language(CXX)
endif()
enable_language(CXX)
endif()
@@
-66,7
+66,7
@@
else()
endif()
set(SIMGRID_VERSION_STRING
endif()
set(SIMGRID_VERSION_STRING
- "SimGrid version ${release_version}${SIMGRID_VERSION_EXTRA}\\nCopyright (c) ${SIMGRID_VERSION_DATE}. The Simgrid Team.")
+ "SimGrid version ${release_version}${SIMGRID_VERSION_EXTRA}\\nCopyright (c)
2004-
${SIMGRID_VERSION_DATE}. The Simgrid Team.")
set(libsimgrid_version "${release_version}")
set(libsimgrid-java_version "${release_version}")
set(libsimgrid_version "${release_version}")
set(libsimgrid-java_version "${release_version}")
@@
-99,6
+99,9
@@
if(${CMAKE_C_COMPILER_ID} STREQUAL "GNU")
endif()
endif()
endif()
endif()
+exec_program("${CMAKE_LINKER} --version" OUTPUT_VARIABLE "LINKER_VERSION")
+string(REGEX MATCH "[0-9].[0-9]*" LINKER_VERSION "${LINKER_VERSION}")
+
string(REGEX MATCH "cl.exe" VBC "${CMAKE_C_COMPILER}")
if(VBC)
message(FATAL_ERROR "VB is not yet supported by Simgrid.")
string(REGEX MATCH "cl.exe" VBC "${CMAKE_C_COMPILER}")
if(VBC)
message(FATAL_ERROR "VB is not yet supported by Simgrid.")
@@
-228,6
+231,10
@@
endif()
include(${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/MakeExe.cmake)
### Make tests
include(${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/MakeExe.cmake)
### Make tests
+if(enable_memcheck_xml)
+ set(enable_memcheck true)
+endif()
+
include(${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/AddTests.cmake)
include(${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/CTestConfig.cmake)
include(${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/AddTests.cmake)
include(${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/CTestConfig.cmake)