From addcea7bcfcc52e8fd5d04ef4170db97491e9e5d Mon Sep 17 00:00:00 2001 From: navarrop Date: Tue, 16 Feb 2010 14:25:58 +0000 Subject: [PATCH] Fix the mcsc problem with mac. git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@7100 48e7efb5-ca39-0410-a469-dd3cf9ba447f --- buildtools/CPACK/src/CMakeCompleteInFiles.txt | 8 +++++++- buildtools/CPACK/src/CMakeMakeExeLib.txt | 4 +--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/buildtools/CPACK/src/CMakeCompleteInFiles.txt b/buildtools/CPACK/src/CMakeCompleteInFiles.txt index 03818c9000..b87989b91e 100644 --- a/buildtools/CPACK/src/CMakeCompleteInFiles.txt +++ b/buildtools/CPACK/src/CMakeCompleteInFiles.txt @@ -30,7 +30,7 @@ if(disable_gtnets) else(disable_gtnets) SET(BUILDNAME "GTNETS" CACHE TYPE INTERNAL FORCE) set(GTNETS_LDFLAGS "-lgtnets -L${gtnets_path}/lib") - set(GTNETS_CPPFLAGS "-I${gtnets_path}/include -I${gtnets_path}/include/gtnets") + set(GTNETS_CPPFLAGS "-I${gtnets_path}/include/gtnets") exec_program("${CMAKE_CXX_COMPILER} ${GTNETS_CPPFLAGS} ${GTNETS_LDFLAGS} ${PROJECT_DIRECTORY}/CPACK/prog_test/prog_gtnets.cpp" OUTPUT_VARIABLE COMPILE_GTNETS_VAR) if(COMPILE_GTNETS_VAR) SET(HAVE_GTNETS 0) @@ -96,9 +96,15 @@ if(pthread MATCHES "yes") endif(pthread MATCHES "yes") # AC_CHECK_MCSC(mcsc=yes, mcsc=no) +set(mcsc_flags "") +if(CMAKE_SYSTEM_NAME MATCHES "Darwin") + set(mcsc_flags "-D_XOPEN_SOURCE") +endif(CMAKE_SYSTEM_NAME MATCHES "Darwin") + try_run(RUN_mcsc_VAR COMPILE_mcsc_VAR ${PROJECT_DIRECTORY} ${PROJECT_DIRECTORY}/CPACK/prog_test/prog_AC_CHECK_MCSC.c + COMPILE_DEFINITIONS "${mcsc_flags}" ) file(READ "${PROJECT_DIRECTORY}/conftestval" mcsc) if(mcsc MATCHES "yes") diff --git a/buildtools/CPACK/src/CMakeMakeExeLib.txt b/buildtools/CPACK/src/CMakeMakeExeLib.txt index 1cb2e5990d..dd5b46ac10 100644 --- a/buildtools/CPACK/src/CMakeMakeExeLib.txt +++ b/buildtools/CPACK/src/CMakeMakeExeLib.txt @@ -15,9 +15,7 @@ set(SIMGRID_DEP "") set(SMPI_DEP "") if(CMAKE_SYSTEM_NAME MATCHES "Darwin") - set(GRAS_DEP "pthread -D_OPEN_SOURCE ") - set(SIMGRID_DEP "-D_OPEN_SOURCE ") - set(SMPI_DEP "-D_OPEN_SOURCE ") + add_definitions("-D_XOPEN_SOURCE") endif(CMAKE_SYSTEM_NAME MATCHES "Darwin") -- 2.20.1