From 18421d59708479e3d54eba71518f761ee470256d Mon Sep 17 00:00:00 2001 From: Transporter Date: Thu, 30 Apr 2020 20:56:55 +0200 Subject: Fix to prevent Boost from linking dynamic and static libraries simultaneously when autolink is enabled. --- CMakeLists.txt | 3 +++ test/CMakeLists.txt | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index f3a7e94..871e9b8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -60,6 +60,9 @@ else() endif() include_directories(${Boost_INCLUDE_DIR}) link_directories(${Boost_LIBRARY_DIR_RELEASE}) +if(NOT Boost_USE_STATIC_LIBS) + add_definitions(-DBOOST_ALL_DYN_LINK) +endif() set(LIB_LIST ${CMAKE_THREAD_LIBS_INIT} diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 3f8249b..0cce236 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -7,5 +7,5 @@ set(TEST_SRC_LIST include_directories("${PROJECT_SOURCE_DIR}/test") add_executable(${PROJECT_NAME}_test ${TEST_SRC_LIST}) -target_link_libraries(${PROJECT_NAME}_test TgBot) +target_link_libraries(${PROJECT_NAME}_test ${PROJECT_NAME}) add_test(${PROJECT_NAME}_test ${PROJECT_NAME}_test) -- cgit v1.2.3