From a062a23c67a1024d32ae3f68dc580f9be56ecbbe Mon Sep 17 00:00:00 2001
From: Navarrop <Pierre.Navarro@imag.fr>
Date: Mon, 16 May 2011 16:12:31 +0200
Subject: [PATCH] In mac ucontext.h is not detected by cmake but we want to use
 it. Set flag "-D_XOPEN_SOURCE" in Flags.cmake

---
 buildtools/Cmake/CompleteInFiles.cmake | 5 +----
 buildtools/Cmake/Flags.cmake           | 5 +++++
 buildtools/Cmake/MakeLib.cmake         | 6 ------
 3 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/buildtools/Cmake/CompleteInFiles.cmake b/buildtools/Cmake/CompleteInFiles.cmake
index 72a6c6cb39..b7a9ea2276 100644
--- a/buildtools/Cmake/CompleteInFiles.cmake
+++ b/buildtools/Cmake/CompleteInFiles.cmake
@@ -208,7 +208,6 @@ IF(CMAKE_CROSSCOMPILING)
 		set(IS_WINDOWS 1)	
 	ENDIF(WIN32)
 ELSE(CMAKE_CROSSCOMPILING)
-    if(HAVE_UCONTEXT_H)
 	try_run(RUN_mcsc_VAR COMPILE_mcsc_VAR
 		${simgrid_BINARY_DIR}
 		${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/test_prog/prog_AC_CHECK_MCSC.c
@@ -221,15 +220,13 @@ ELSE(CMAKE_CROSSCOMPILING)
 			STRING(REPLACE "\n" "" mcsc "${mcsc}")
 			if(mcsc)
 				set(mcsc "yes")
+				set(HAVE_UCONTEXT_H 1)
 			else(mcsc)
 				set(mcsc "no")
 			endif(mcsc)
 	    else(EXISTS "${simgrid_BINARY_DIR}/conftestval" AND COMPILE_mcsc_VAR)
 			set(mcsc "no")
 		endif(EXISTS "${simgrid_BINARY_DIR}/conftestval" AND COMPILE_mcsc_VAR)
-	else(HAVE_UCONTEXT_H)
-        set(mcsc "no")   
-	endif(HAVE_UCONTEXT_H)
 ENDIF(CMAKE_CROSSCOMPILING)
 
 if(mcsc MATCHES "no" AND pthread)
diff --git a/buildtools/Cmake/Flags.cmake b/buildtools/Cmake/Flags.cmake
index e6e97fdb39..8bd0b594f1 100644
--- a/buildtools/Cmake/Flags.cmake
+++ b/buildtools/Cmake/Flags.cmake
@@ -28,6 +28,11 @@ if(WIN32)
 	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -march=i486")
 endif(WIN32)
 
+# Try to make Mac a bit more complient to open source standards
+if(CMAKE_SYSTEM_NAME MATCHES "Darwin")
+	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D_XOPEN_SOURCE")
+endif(CMAKE_SYSTEM_NAME MATCHES "Darwin")
+
 if(enable_coverage)
 	find_program(GCOV_PATH gcov)
 	if(GCOV_PATH)
diff --git a/buildtools/Cmake/MakeLib.cmake b/buildtools/Cmake/MakeLib.cmake
index 06185fbe1b..1c41430e8b 100644
--- a/buildtools/Cmake/MakeLib.cmake
+++ b/buildtools/Cmake/MakeLib.cmake
@@ -1,11 +1,5 @@
 ### Make Libs
 
-
-# Try to make Mac a bit more complient to open source standards
-if(CMAKE_SYSTEM_NAME MATCHES "Darwin")
-	add_definitions("-D_XOPEN_SOURCE")
-endif(CMAKE_SYSTEM_NAME MATCHES "Darwin")
-
 ###############################
 # Declare the library content #
 ###############################
-- 
2.20.1