Compilation and context work on Mac

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

diff --git a/buildtools/CPACK/prog_test/prog_stacksetup.c b/buildtools/CPACK/prog_test/prog_stacksetup.c
index bb6861f..bf7b569 100644 (file)
--- a/buildtools/CPACK/prog_test/prog_stacksetup.c
+++ b/buildtools/CPACK/prog_test/prog_stacksetup.c
@@ -1,3 +1,4 @@
+#define _XOPEN_SOURCE
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>

diff --git a/buildtools/CPACK/src/CTestConfig.cmake b/buildtools/CPACK/src/CTestConfig.cmake
index c8aacb0..ddf566d 100644 (file)
--- a/buildtools/CPACK/src/CTestConfig.cmake
+++ b/buildtools/CPACK/src/CTestConfig.cmake
@@ -17,13 +17,13 @@ exec_program("${CAT}" ARGS "version" OUTPUT_VARIABLE VERSION)
 if(CMAKE_SYSTEM_NAME STREQUAL "Darwin")
   SET(DISTRIB2 "OSX")
 else(CMAKE_SYSTEM_NAME STREQUAL "Darwin")
-
   #Try to get the distrib
   exec_program("${CAT}" ARGS " /etc/issue" OUTPUT_VARIABLE DISTRIB)
   MARK_AS_ADVANCED(CAT)
+  STRING(REPLACE " \\n \\l" "" DISTRIB2 ${DISTRIB})
 endif(CMAKE_SYSTEM_NAME STREQUAL "Darwin")
 
-STRING(REPLACE " \\n \\l" "" DISTRIB2 ${DISTRIB})
+
          
 getuname(osname -s)
 getuname(node -n)