X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/81606342f748dd45f481abe9171bccf7deac0fa5..df3bdefc3df0a0810cf48411dd588ed63c65a302:/CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e41ea66331..70b1bf2a1f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -116,7 +116,7 @@ else()
   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
@@ -414,7 +414,7 @@ endif()
 
 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()
@@ -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)
+else()
+  set(GIT_VERSION "none, release version")
 endif()
 
 ### Generate the required headers and scripts