diff options
| author | Brad King <brad.king@kitware.com> | 2016-04-20 13:52:38 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2016-04-20 13:52:38 (GMT) |
| commit | 0d4c75ecfbabc55b5705f21982a84ab5fa6b7e18 (patch) | |
| tree | cff5e5cdcd2e14cf2c43dd94f975c03c2c94c801 /Modules | |
| parent | 2ecadc96bc1d3dc8fd4d5c1ee9295a944436d070 (diff) | |
| parent | 2c1b720e643aafd725a8c0be11913834704d7269 (diff) | |
| download | CMake-0d4c75ecfbabc55b5705f21982a84ab5fa6b7e18.zip CMake-0d4c75ecfbabc55b5705f21982a84ab5fa6b7e18.tar.gz CMake-0d4c75ecfbabc55b5705f21982a84ab5fa6b7e18.tar.bz2 | |
Merge topic 'boost-import-default'
2c1b720e FindBoost: Define Boost::boost for all boost versions
Diffstat (limited to 'Modules')
| -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 9e6083db..38ccf78 100644 --- a/Modules/FindBoost.cmake +++ b/Modules/FindBoost.cmake @@ -1573,7 +1573,7 @@ endif() # Add imported targets # ------------------------------------------------------------------------ -if(Boost_FOUND AND _Boost_IMPORTED_TARGETS) +if(Boost_FOUND) # For header-only libraries if(NOT TARGET Boost::boost) add_library(Boost::boost INTERFACE IMPORTED) @@ -1584,7 +1584,7 @@ if(Boost_FOUND AND _Boost_IMPORTED_TARGETS) endif() foreach(COMPONENT ${Boost_FIND_COMPONENTS}) - if(NOT TARGET Boost::${COMPONENT}) + if(_Boost_IMPORTED_TARGETS AND NOT TARGET Boost::${COMPONENT}) string(TOUPPER ${COMPONENT} UPPERCOMPONENT) if(Boost_${UPPERCOMPONENT}_FOUND) if(Boost_USE_STATIC_LIBS) |