diff --git a/cmake/PackageDepends/RTTB_BoostBinaries_Config.cmake b/cmake/PackageDepends/RTTB_BoostBinaries_Config.cmake index dc73c72..4f69902 100644 --- a/cmake/PackageDepends/RTTB_BoostBinaries_Config.cmake +++ b/cmake/PackageDepends/RTTB_BoostBinaries_Config.cmake @@ -1,19 +1,26 @@ IF(NOT DEFINED RTTB_USE_MITK_BOOST) OPTION(RTTB_USE_MITK_BOOST "RTTB should use a boost which is available in the MITK superbuild external projects structure." OFF) MARK_AS_ADVANCED(RTTB_USE_MITK_BOOST) ENDIF(NOT DEFINED RTTB_USE_MITK_BOOST) IF(BUILD_SHARED_LIBS OR RTTB_USE_MITK_BOOST) SET(Boost_USE_STATIC_LIBS OFF) - ADD_DEFINITIONS(-DBOOST_ALL_DYN_LINK) + ADD_DEFINITIONS(-DBOOST_ALL_DYN_LINK) ELSE(BUILD_SHARED_LIBS OR RTTB_USE_MITK_BOOST) SET(Boost_USE_STATIC_LIBS ON) ENDIF(BUILD_SHARED_LIBS OR RTTB_USE_MITK_BOOST) SET(BOOST_MIN_VERSION "1.64.0") FIND_PACKAGE(Boost ${BOOST_MIN_VERSION} REQUIRED COMPONENTS filesystem system ${RTTB_Boost_ADDITIONAL_COMPONENT} QUIET) if(Boost_LIBRARIES) - LIST(APPEND ALL_INCLUDE_DIRECTORIES ${Boost_INCLUDE_DIRS}) - LIST(APPEND ALL_LIBRARIES ${Boost_LIBRARIES}) - link_directories(${Boost_LIBRARY_DIRS}) + LIST(APPEND ALL_INCLUDE_DIRECTORIES ${Boost_INCLUDE_DIRS}) + LIST(APPEND ALL_LIBRARIES ${Boost_LIBRARIES}) + + IF(BUILD_SHARED_LIBS OR RTTB_USE_MITK_BOOST) + IF(MSVC) + list(APPEND ALL_LIBRARIES "Boost::dynamic_linking" "bcrypt") + ENDIF(MSVC) + ENDIF(BUILD_SHARED_LIBS OR RTTB_USE_MITK_BOOST) + + link_directories(${Boost_LIBRARY_DIRS}) endif()