#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#
set(SIMGRID_VERSION_MAJOR "3")
-set(SIMGRID_VERSION_MINOR "13")
-set(SIMGRID_VERSION_PATCH "91")
-set(SIMGRID_VERSION_EXTRA "-alpha") # Extra words to add to version string (e.g. -rc1)
+set(SIMGRID_VERSION_MINOR "15")
+set(SIMGRID_VERSION_PATCH "0")
+set(SIMGRID_VERSION_EXTRA "-DEVEL") # Extra words to add to version string (e.g. -rc1)
set(SIMGRID_VERSION_DATE "2016") # Year for copyright information
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
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()
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