diff options
| author | Brad King <brad.king@kitware.com> | 2019-03-12 13:53:26 +0000 |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2019-03-12 09:54:23 -0400 |
| commit | 57d178bbca7757792653f1a658423826c52b5730 (patch) | |
| tree | 59dd5aa7a51f404ebd013d03dd541c80177bc9b8 | |
| parent | 5822a7bed289100b78a502e449b436da2fe67af1 (diff) | |
| parent | 05774d4b5845d0b7cbdd1985922b3351a4ebb39d (diff) | |
| download | cmake-57d178bbca7757792653f1a658423826c52b5730.tar.gz | |
Merge topic 'FindBoost-dyn-link'
05774d4b58 FindBoost: always define BOOST_ALL_DYN_LINK for Boost::dynamic_linking
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3083
| -rw-r--r-- | Modules/FindBoost.cmake | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Modules/FindBoost.cmake b/Modules/FindBoost.cmake index 7882c4bdf6..6e7d3dbf9e 100644 --- a/Modules/FindBoost.cmake +++ b/Modules/FindBoost.cmake @@ -1201,6 +1201,8 @@ if(NOT TARGET Boost::diagnostic_definitions) add_library(Boost::diagnostic_definitions INTERFACE IMPORTED) add_library(Boost::disable_autolinking INTERFACE IMPORTED) add_library(Boost::dynamic_linking INTERFACE IMPORTED) + set_target_properties(Boost::dynamic_linking PROPERTIES + INTERFACE_COMPILE_DEFINITIONS "BOOST_ALL_DYN_LINK") endif() if(WIN32) # In windows, automatic linking is performed, so you do not have @@ -1225,8 +1227,6 @@ if(WIN32) INTERFACE_COMPILE_DEFINITIONS "BOOST_LIB_DIAGNOSTIC") set_target_properties(Boost::disable_autolinking PROPERTIES INTERFACE_COMPILE_DEFINITIONS "BOOST_ALL_NO_LIB") - set_target_properties(Boost::dynamic_linking PROPERTIES - INTERFACE_COMPILE_DEFINITIONS "BOOST_ALL_DYN_LINK") endif() _Boost_CHECK_SPELLING(Boost_ROOT) |