From 03bbf6859e737826f55b15ea6d81f229f3fb8097 Mon Sep 17 00:00:00 2001 From: navarrop Date: Mon, 31 May 2010 11:50:34 +0000 Subject: [PATCH 1/1] 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 --- buildtools/Cmake/Option.cmake | 6 +++++- buildtools/Cmake/PrintArgs.cmake | 4 ++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/buildtools/Cmake/Option.cmake b/buildtools/Cmake/Option.cmake index 82bbac4c2c..d425823c14 100644 --- 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 d907191749..17d83721b4 100644 --- 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") -- 2.20.1