From 9a47ea253b065e847866da0694eb47772897d0d3 2017-11-10 14:00:47 From: Vitaly Takmazov Date: 2017-11-10 14:00:47 Subject: [PATCH] dynamic Boost linking under Windows --- diff --git a/CMakeLists.txt b/CMakeLists.txt index a0516fe5c8f6d015b0b02b589861092d22ca5dd9..66e97f0f275de103210360657789284f6082ecf9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -80,9 +80,11 @@ endif() # FIND BOOST if (WIN32) - set(Boost_USE_STATIC_LIBS ON) + set(Boost_USE_STATIC_LIBS OFF) set(Boost_USE_MULTITHREADED ON) set(Boost_USE_STATIC_RUNTIME OFF) + add_definitions(-DBOOST_ALL_DYN_LINK) + add_definitions(-DBOOST_ALL_NO_LIB) endif(WIN32) set(Boost_FIND_QUIETLY ON) find_package(Boost COMPONENTS program_options date_time system filesystem regex thread signals locale REQUIRED) @@ -181,6 +183,9 @@ endif() if (WIN32) add_definitions(-DSWIFTEN_STATIC=1) + ADD_DEFINITIONS(-D_WIN32_WINNT=0x0600) + ADD_DEFINITIONS(-DWIN32_LEAN_AND_MEAN) + ADD_DEFINITIONS(-DBOOST_USE_WINDOWS_H) ADD_DEFINITIONS(-D_UNICODE) ADD_DEFINITIONS(-DUNICODE) endif() @@ -396,10 +401,6 @@ endif() if (WIN32) ADD_DEFINITIONS(-DLOG4CXX_STATIC) - ADD_DEFINITIONS(-D_WIN32_WINNT=0x501) - ADD_DEFINITIONS(-DWIN32_LEAN_AND_MEAN) - ADD_DEFINITIONS(-DBOOST_USE_WINDOWS_H) - ADD_DEFINITIONS(-DBOOST_THREAD_USE_LIB) endif() if(CMAKE_BUILD_TYPE MATCHES Debug)