On Mac set smpi to off by default.

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@7813 48e7efb5-ca39-0410-a469-dd3cf9ba447f

diff --git a/buildtools/Cmake/Option.cmake b/buildtools/Cmake/Option.cmake
index 82bbac4..d425823 100644 (file)
--- a/buildtools/Cmake/Option.cmake
+++ b/buildtools/Cmake/Option.cmake
@@ -16,7 +16,11 @@ if(NOT with_context)
        set(with_context "auto" CACHE TYPE INTERNAL FORCE)
 endif(NOT with_context)
 
-option(enable_smpi "This variable set smpi lib." on)
+if(CMAKE_SYSTEM_NAME MATCHES "Darwin")
+       option(enable_smpi "This variable set smpi lib." off) #for the moment it doesn't compil with MacOS
+else(CMAKE_SYSTEM_NAME MATCHES "Darwin")
+       option(enable_smpi "This variable set smpi lib." on)
+endif(CMAKE_SYSTEM_NAME MATCHES "Darwin")
 option(enable_gtnets "This variable set the gtnets context." on)
 option(enable_java "This variable set the java context." off)
 option(enable_lua "This variable set lua use." on)

diff --git a/buildtools/Cmake/PrintArgs.cmake b/buildtools/Cmake/PrintArgs.cmake
index d907191..17d8372 100644 (file)
--- a/buildtools/Cmake/PrintArgs.cmake
+++ b/buildtools/Cmake/PrintArgs.cmake
@@ -143,6 +143,6 @@ message("   INSTALL_PREFIX:         ${CMAKE_INSTALL_PREFIX}")
 message("")
 
 exec_program("${CMAKE_COMMAND} -E make_directory ${simgrid_BINARY_DIR}/Testing/Notes/")
-file(WRITE ${simgrid_BINARY_DIR}/Testing/Notes/Build  "svn version : ${SVN_VERSION}")
-file(APPEND ${simgrid_BINARY_DIR}/Testing/Notes/Build "Release   :     simgrid-${release_version}~rev${SVN_VERSION}")
+file(WRITE ${simgrid_BINARY_DIR}/Testing/Notes/Build  "SVN version : ${SVN_VERSION}\n")
+file(APPEND ${simgrid_BINARY_DIR}/Testing/Notes/Build "Release     : simgrid-${release_version}\n")