X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/4787d30c2fcd7987135ecc4ff9d11eb530d851bd..59094fa79de9a5e0e8d29ee12f34156d4be87156:/tools/cmake/MakeLibWin.cmake

diff --git a/tools/cmake/MakeLibWin.cmake b/tools/cmake/MakeLibWin.cmake
index 2a2a69aa77..428fba4f2f 100644
--- a/tools/cmake/MakeLibWin.cmake
+++ b/tools/cmake/MakeLibWin.cmake
@@ -4,11 +4,11 @@ add_library(simgrid SHARED ${simgrid_sources})
 
 if(MSVC)
   set_target_properties(simgrid  PROPERTIES 
-       COMPILE_FLAGS "/D_XBT_DLL_EXPORT /DDLL_EXPORT" 
+       COMPILE_FLAGS "/DDLL_EXPORT" 
        VERSION ${libsimgrid_version} )
 else()
   set_target_properties(simgrid  PROPERTIES 
-       COMPILE_FLAGS "-D_XBT_DLL_EXPORT -DDLL_EXPORT" 
+       COMPILE_FLAGS "-DDLL_EXPORT" 
        LINK_FLAGS "-shared" 
        VERSION ${libsimgrid_version} 
        PREFIX "lib" SUFFIX ".dll" 
@@ -19,7 +19,13 @@ 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})
 
+# The library can obviously use the internal headers
+set_property(TARGET simgrid
+             APPEND PROPERTY INCLUDE_DIRECTORIES "${INTERNAL_INCLUDES}")