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
better handling of the MC debug on unknown simcalls
[simgrid.git]
/
CMakeLists.txt
diff --git
a/CMakeLists.txt
b/CMakeLists.txt
index
258f10a
..
382a88e
100644
(file)
--- a/
CMakeLists.txt
+++ b/
CMakeLists.txt
@@
-89,11
+89,11
@@
endif()
#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#
set(SIMGRID_VERSION_MAJOR "3")
#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#
set(SIMGRID_VERSION_MAJOR "3")
-set(SIMGRID_VERSION_MINOR "1
4
")
+set(SIMGRID_VERSION_MINOR "1
6
")
set(SIMGRID_VERSION_PATCH "0")
set(SIMGRID_VERSION_PATCH "0")
-
# set(SIMGRID_VERSION_EXTRA "-alpha
") # Extra words to add to version string (e.g. -rc1)
+
set(SIMGRID_VERSION_EXTRA "-DEVEL
") # Extra words to add to version string (e.g. -rc1)
-set(SIMGRID_VERSION_DATE "201
6
") # Year for copyright information
+set(SIMGRID_VERSION_DATE "201
7
") # 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}")
@@
-116,7
+116,7
@@
else()
set(LIB_EXE "so")
endif()
set(LIB_EXE "so")
endif()
-execute_process(COMMAND
${CMAKE_LINKER} -version OUTPUT
_VARIABLE LINKER_VERSION)
+execute_process(COMMAND
${CMAKE_LINKER} -version OUTPUT_VARIABLE LINKER_VERSION ERROR
_VARIABLE LINKER_VERSION)
string(REGEX MATCH "[0-9].[0-9]*" LINKER_VERSION "${LINKER_VERSION}")
### Set the library providing dlopen
string(REGEX MATCH "[0-9].[0-9]*" LINKER_VERSION "${LINKER_VERSION}")
### Set the library providing dlopen
@@
-414,7
+414,7
@@
endif()
if(enable_smpi)
SET(HAVE_SMPI 1)
if(enable_smpi)
SET(HAVE_SMPI 1)
- if("${CMAKE_SYSTEM}" MATCHES "
Linux|FreeBSD
")
+ if("${CMAKE_SYSTEM}" MATCHES "
Darwin|FreeBSD|Linux
")
SET(USE_LIBUTIL 0)
SET(HAVE_PRIVATIZATION 1)
else()
SET(USE_LIBUTIL 0)
SET(HAVE_PRIVATIZATION 1)
else()
@@
-660,6
+660,8
@@
if(EXISTS ${CMAKE_HOME_DIRECTORY}/.git/)
endif()
elseif(EXISTS ${CMAKE_HOME_DIRECTORY}/.gitversion)
FILE(STRINGS ${CMAKE_HOME_DIRECTORY}/.gitversion GIT_VERSION)
endif()
elseif(EXISTS ${CMAKE_HOME_DIRECTORY}/.gitversion)
FILE(STRINGS ${CMAKE_HOME_DIRECTORY}/.gitversion GIT_VERSION)
+else()
+ set(GIT_VERSION "none, release version")
endif()
### Generate the required headers and scripts
endif()
### Generate the required headers and scripts