From: Martin Quinson <martin.quinson@loria.fr>
Date: Mon, 7 Mar 2016 09:49:11 +0000 (+0100)
Subject: Merge branch 'master' of scm.gforge.inria.fr:/gitroot/simgrid/simgrid
X-Git-Tag: v3_13~500^2~4
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/404c50aac04e8ea4708cad0b80290945d4d07838?hp=7464efd30359d41efbe4d9ed402b7192183d1f4c

Merge branch 'master' of scm.gforge.inria.fr:/gitroot/simgrid/simgrid
---

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0252eedf9f..0217261ba6 100644
--- 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})
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})