X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/7da2926d0733ff0683f31aeea176ce71e127264f..c4de3b4124781ae066e774981efb0a6ef8c857ed:/tools/cmake/MakeLibWin.cmake diff --git a/tools/cmake/MakeLibWin.cmake b/tools/cmake/MakeLibWin.cmake index 2a2a69aa77..e7c5783059 100644 --- a/tools/cmake/MakeLibWin.cmake +++ b/tools/cmake/MakeLibWin.cmake @@ -3,23 +3,26 @@ add_library(simgrid SHARED ${simgrid_sources}) if(MSVC) - set_target_properties(simgrid PROPERTIES - COMPILE_FLAGS "/D_XBT_DLL_EXPORT /DDLL_EXPORT" + set_target_properties(simgrid PROPERTIES + COMPILE_FLAGS "/DDLL_EXPORT" VERSION ${libsimgrid_version} ) else() - set_target_properties(simgrid PROPERTIES - COMPILE_FLAGS "-D_XBT_DLL_EXPORT -DDLL_EXPORT" - LINK_FLAGS "-shared" - VERSION ${libsimgrid_version} - PREFIX "lib" SUFFIX ".dll" + set_target_properties(simgrid PROPERTIES + COMPILE_FLAGS "-DDLL_EXPORT" + LINK_FLAGS "-shared" + VERSION ${libsimgrid_version} + PREFIX "lib" SUFFIX ".dll" IMPORT_PREFIX "lib" IMPORT_SUFFIX ".dll") set(SIMGRID_DEP "-lm") - if (HAVE_PTHREAD) - set(SIMGRID_DEP "${SIMGRID_DEP} -lpthread") + 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}")