put add_tesh where they belong for simix

[simgrid.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3ec3296..4459d8d 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -194,8 +194,8 @@ IF(CMAKE_SYSTEM_PROCESSOR MATCHES ".86|AMD64|amd64")
     message(STATUS "System processor: x86_64 (${CMAKE_SYSTEM_PROCESSOR}, 64 bits)")
     set(PROCESSOR_x86_64 1)
   ENDIF()
-  if (MSVC)
-    message(STATUS "Disable fast raw contextes on Microsoft Visual.")
+  if (WIN32)
+    message(STATUS "Disable fast raw contextes on Windows.")
   else()
     set(HAVE_RAW_CONTEXTS 1)
   endif()
@@ -226,6 +226,10 @@ if(enable_ns3)
   endif()
 endif()
 
+if(WIN32)
+  set(Boost_USE_STATIC_LIBS 1)
+endif()
+
 find_package(Boost 1.48)
 if(Boost_FOUND)
   include_directories(${Boost_INCLUDE_DIRS})
@@ -332,9 +336,6 @@ else()
   SET(HAVE_MMALLOC 0)
 endif()
 
-set(HAVE_UCONTEXT_CONTEXTS 0)
-set(HAVE_THREAD_CONTEXTS 0)
-
 if(enable_jedule)
   set(HAVE_JEDULE 1)
 endif()
@@ -347,7 +348,6 @@ endif()
 
 if(enable_model-checking AND HAVE_MMALLOC)
   SET(HAVE_MC 1)
-  SET(MMALLOC_WANT_OVERRIDE_LEGACY 1)
   include(FindLibunwind)
   include(FindLibdw)
 else()
@@ -356,7 +356,6 @@ else()
   endif()
   SET(HAVE_MC 0)
   SET(HAVE_MMALLOC 0)
-  SET(MMALLOC_WANT_OVERRIDE_LEGACY 0)
 endif()
 
 if(enable_smpi)
@@ -411,6 +410,8 @@ endif()
 #--------------------------------------------------------------------------------------------------
 ### Initialize of CONTEXT THREADS
 
+set(HAVE_THREAD_CONTEXTS 0)
+
 if(HAVE_PTHREAD)
   ### Test that we have a way to create semaphores
 
@@ -502,21 +503,18 @@ if(HAVE_PTHREAD)
     message(FATAL_ERROR "Semaphores are not usable (neither sem_open nor sem_init is both compilable and executable), but they are mandatory to threads (you may need to mount /dev).")
   endif()
 
-endif()
-
-if(HAVE_PTHREAD)
   set(HAVE_THREAD_CONTEXTS 1)
   message("-- Support for thread context factory ok.")
 endif()
 
 
+set(HAVE_UCONTEXT_CONTEXTS 0)
 if(NOT HAVE_UCONTEXT_H)
   message("-- No ucontext factory: <ucontext.h> not found.")
+elseif(APPLE)
+  message("-- No ucontext factory: Apple don't want us to use them.")
+  set(HAVE_UCONTEXT_H 0)
 else()
-  # This is needed for ucontext on MacOS X:
-  if(CMAKE_SYSTEM_NAME MATCHES "Darwin")
-    add_definitions(-D_XOPEN_SOURCE=700 -D_DARWIN_C_SOURCE)
-  endif()
   try_compile(compile_makecontext ${CMAKE_BINARY_DIR} ${CMAKE_HOME_DIRECTORY}/tools/cmake/test_prog/prog_makecontext.c
     OUTPUT_VARIABLE compile_makecontext_output)
   
@@ -543,30 +541,30 @@ else()
   else()
     message(FATAL_ERROR "Could not figure out the stack setup. Compil: ${RUN_makecontext_VAR}. Exec: ${COMPILE_makecontext_VAR}. Output: ${stack_setup}")
   endif()
-  
-  # Stack growth direction (upward or downward)
-  try_run(RUN_stackgrowth_VAR COMPILE_stackgrowth_VAR
-    ${CMAKE_BINARY_DIR}
-    ${CMAKE_HOME_DIRECTORY}/tools/cmake/test_prog/prog_stackgrowth.c
-    RUN_OUTPUT_VARIABLE stack
-    COPY_FILE test_stackgrowth)
-
-  if("${stack}" STREQUAL "down")
+endif()
+
+# Stack growth direction (upward or downward). Used for the following contexts: SysV, raw, Boost
+try_run(RUN_stackgrowth_VAR COMPILE_stackgrowth_VAR
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_HOME_DIRECTORY}/tools/cmake/test_prog/prog_stackgrowth.c
+  RUN_OUTPUT_VARIABLE stack
+  COPY_FILE test_stackgrowth)
+
+if("${stack}" STREQUAL "down")
+  set(PTH_STACKGROWTH "-1")
+elseif("${stack}" STREQUAL "up")
+  set(PTH_STACKGROWTH "1")
+else()
+  if("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "x86_64")
+    set(PTH_STACKGROWTH "-1")
+  elseif("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "i686")
     set(PTH_STACKGROWTH "-1")
-  elseif("${stack}" STREQUAL "up")
-    set(PTH_STACKGROWTH "1")
   else()
-    if("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "x86_64")
-      set(PTH_STACKGROWTH "-1")
-    elseif("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "i686")
-      set(PTH_STACKGROWTH "-1")
-    else()
-      message(FATAL_ERROR "Could not figure out the stack direction. Test prog returned: ${stack}; CMAKE_SYSTEM_PROCESSOR: ${CMAKE_SYSTEM_PROCESSOR}.")
-    endif()
+    message(FATAL_ERROR "Could not figure out the stack direction. Test prog returned: ${stack}; CMAKE_SYSTEM_PROCESSOR: ${CMAKE_SYSTEM_PROCESSOR}.")
   endif()
-  # If the test ran well, remove the test binary
-  execute_process(COMMAND ${CMAKE_COMMAND} -E remove test_stackgrowth)
 endif()
+# If the test ran well, remove the test binary
+execute_process(COMMAND ${CMAKE_COMMAND} -E remove test_stackgrowth)
 #--------------------------------------------------------------------------------------------------
 
 ### check for addr2line