Logo AND Algorithmique Numérique Distribuée

Public GIT Repository
Merge branch 'master' of scm.gforge.inria.fr:/gitroot/simgrid/simgrid
authorMartin Quinson <martin.quinson@loria.fr>
Mon, 7 Mar 2016 09:49:11 +0000 (10:49 +0100)
committerMartin Quinson <martin.quinson@loria.fr>
Mon, 7 Mar 2016 09:49:11 +0000 (10:49 +0100)
CMakeLists.txt
tools/cmake/MakeLibWin.cmake

index 0252eed..0217261 100644 (file)
@@ -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})
index 67bc91e..fdbafe3 100644 (file)
@@ -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})