From: degomme <augustin.degomme@unibas.ch>
Date: Mon, 7 Mar 2016 09:35:00 +0000 (+0100)
Subject: Enable Boost contextes on Windows
X-Git-Tag: v3_13~500^2~4^2
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/a2edf8c05c4c543c8926cb454d2fb66cb5e8a0d8

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 6ef0d803a3..14db0b4bab 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -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})
diff --git a/tools/cmake/MakeLibWin.cmake b/tools/cmake/MakeLibWin.cmake
index 67bc91e97f..fdbafe327d 100644
--- 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_BOOST_CONTEXTS)
+    set(SIMGRID_DEP "${SIMGRID_DEP} ${Boost_CONTEXT_LIBRARY}")
+  endif()
 endif()
 
 target_link_libraries(simgrid 	${SIMGRID_DEP})