Enable Boost contextes on Windows

Detection fails on our test platform if we don't use static version

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6ef0d80..14db0b4 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -226,6 +226,10 @@ if(enable_ns3)
   endif()
 endif()
 
   endif()
 endif()
 

+if(WIN32)
+  set(Boost_USE_STATIC_LIBS 1)
+endif()
+

 find_package(Boost 1.48)
 if(Boost_FOUND)
   include_directories(${Boost_INCLUDE_DIRS})
 find_package(Boost 1.48)
 if(Boost_FOUND)
   include_directories(${Boost_INCLUDE_DIRS})

diff --git a/tools/cmake/MakeLibWin.cmake b/tools/cmake/MakeLibWin.cmake
index 67bc91e..fdbafe3 100644 (file)
--- a/tools/cmake/MakeLibWin.cmake
+++ b/tools/cmake/MakeLibWin.cmake
@@ -19,6 +19,9 @@ else()
   if (HAVE_PTHREAD)
     set(SIMGRID_DEP "${SIMGRID_DEP} -lpthread")
   endif()
   if (HAVE_PTHREAD)
     set(SIMGRID_DEP "${SIMGRID_DEP} -lpthread")
   endif()

+  if (HAVE_BOOST_CONTEXTS)
+    set(SIMGRID_DEP "${SIMGRID_DEP} ${Boost_CONTEXT_LIBRARY}")
+  endif()

 endif()
 
 target_link_libraries(simgrid  ${SIMGRID_DEP})
 endif()
 
 target_link_libraries(simgrid  ${SIMGRID_DEP})