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
Revert "the users are not the only ones lost with 10e0 :)"
[simgrid.git]
/
CMakeLists.txt
diff --git
a/CMakeLists.txt
b/CMakeLists.txt
index
cfae0bb
..
a79cfa2
100644
(file)
--- a/
CMakeLists.txt
+++ b/
CMakeLists.txt
@@
-51,13
+51,14
@@
set(CMAKE_Fortran_LINK_FLAGS "" CACHE TYPE INTERNAL FORCE)
# 3.9.90 -> release 3.10pre1
# 3.10.0 -> release 3.10
# 3.11.0 -> release 3.11
# 3.9.90 -> release 3.10pre1
# 3.10.0 -> release 3.10
# 3.11.0 -> release 3.11
+# 3.12.0 -> release 3.12
set(SIMGRID_VERSION_MAJOR "3")
set(SIMGRID_VERSION_MAJOR "3")
-set(SIMGRID_VERSION_MINOR "1
1
")
+set(SIMGRID_VERSION_MINOR "1
2
")
set(SIMGRID_VERSION_PATCH "0")
set(SIMGRID_VERSION_EXTRA "-devel") # Extra words to add to version string (e.g. -rc1)
set(SIMGRID_VERSION_PATCH "0")
set(SIMGRID_VERSION_EXTRA "-devel") # Extra words to add to version string (e.g. -rc1)
-set(SIMGRID_VERSION_DATE "201
3
") # Year for copyright information
+set(SIMGRID_VERSION_DATE "201
4
") # Year for copyright information
if(${SIMGRID_VERSION_PATCH} EQUAL "0")
set(release_version "${SIMGRID_VERSION_MAJOR}.${SIMGRID_VERSION_MINOR}")
if(${SIMGRID_VERSION_PATCH} EQUAL "0")
set(release_version "${SIMGRID_VERSION_MAJOR}.${SIMGRID_VERSION_MINOR}")
@@
-66,7
+67,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
+100,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
+232,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)