From 3d7e7eee763c2f0b71df75a4da2306a6bb01f2b0 Mon Sep 17 00:00:00 2001 From: Navarrop Date: Thu, 23 Jun 2011 16:45:18 +0200 Subject: [PATCH] To use ucontext on OSX gcc must be greater than 4.5 --- CMakeLists.txt | 3 +-- buildtools/Cmake/CompleteInFiles.cmake | 10 ++++++++++ 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 67a7a81a95..b4f48f4f75 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -18,13 +18,12 @@ set(SIMGRID_VERSION_MAJOR "3") set(SIMGRID_VERSION_MINOR "6") set(SIMGRID_VERSION_PATCH "0") - - set(release_version "${SIMGRID_VERSION_MAJOR}.${SIMGRID_VERSION_MINOR}") set(libsimgrid_version "${release_version}") set(libgras_version "${release_version}") set(libsmpi_version "${release_version}") set(GCC_NEED_VERSION "4.0") +set(APPLE_NEED_GCC_VERSION "4.6") ### SET THE LIBRARY EXTENSION AND GCC VERSION if(APPLE) #MAC diff --git a/buildtools/Cmake/CompleteInFiles.cmake b/buildtools/Cmake/CompleteInFiles.cmake index 492c173224..49d1d001f0 100644 --- a/buildtools/Cmake/CompleteInFiles.cmake +++ b/buildtools/Cmake/CompleteInFiles.cmake @@ -697,6 +697,16 @@ if(ADDR2LINE) set(ADDR2LINE "${ADDR2LINE}/addr2line") endif(ADDR2LINE) + + +### Check if OSX can compile with ucontext (with gcc 4.[1-5] it is broken) +if(APPLE) + if(APPLE_NEED_GCC_VERSION GREATER COMPILER_C_VERSION_MAJOR_MINOR) + message(STATUS "Ucontext can't be used with this version of gcc (must be greater than 4.5") + set(HAVE_UCONTEXT_H 0) + endif(APPLE_NEED_GCC_VERSION GREATER COMPILER_C_VERSION_MAJOR_MINOR) +endif(APPLE) + ### File to create configure_file("${CMAKE_HOME_DIRECTORY}/src/context_sysv_config.h.in" "${CMAKE_BINARY_DIR}/src/context_sysv_config.h" @ONLY IMMEDIATE) -- 2.20.1