diff options
| author | Roger Leigh <r.leigh@dundee.ac.uk> | 2016-04-17 15:24:51 (GMT) |
|---|---|---|
| committer | Roger Leigh <r.leigh@dundee.ac.uk> | 2016-04-19 21:07:45 (GMT) |
| commit | 2c1b720e643aafd725a8c0be11913834704d7269 (patch) | |
| tree | 99f5db85aeb07ccab6b934aa54e56a2d224e11f0 | |
| parent | 7d4c99a957b37e6905af3fe6ea96b7fdf2b8359c (diff) | |
| download | CMake-2c1b720e643aafd725a8c0be11913834704d7269.zip CMake-2c1b720e643aafd725a8c0be11913834704d7269.tar.gz CMake-2c1b720e643aafd725a8c0be11913834704d7269.tar.bz2 | |
FindBoost: Define Boost::boost for all boost versions
| -rw-r--r-- | Modules/FindBoost.cmake | 4 | ||||
| -rw-r--r-- | Tests/CFBundleTest/Localized.rsrc | bin | 496 -> 472 bytes | |||
| -rw-r--r-- | Tests/FindBoost/CMakeLists.txt | 11 | ||||
| -rw-r--r-- | Tests/FindBoost/TestHeaders/CMakeLists.txt | 10 | ||||
| -rw-r--r-- | Tests/FindBoost/TestHeaders/main.cxx | 9 |
5 files changed, 32 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) diff --git a/Tests/CFBundleTest/Localized.rsrc b/Tests/CFBundleTest/Localized.rsrc Binary files differindex cbf3523..7973c1f 100644 --- a/Tests/CFBundleTest/Localized.rsrc +++ b/Tests/CFBundleTest/Localized.rsrc diff --git a/Tests/FindBoost/CMakeLists.txt b/Tests/FindBoost/CMakeLists.txt index 259ee26..0e9527d 100644 --- a/Tests/FindBoost/CMakeLists.txt +++ b/Tests/FindBoost/CMakeLists.txt @@ -8,3 +8,14 @@ add_test(NAME FindBoost.Test COMMAND --build-options ${build_options} --test-command ${CMAKE_CTEST_COMMAND} -V -C $<CONFIGURATION> ) + +add_test(NAME FindBoost.TestHeaders COMMAND + ${CMAKE_CTEST_COMMAND} -C $<CONFIGURATION> + --build-and-test + "${CMake_SOURCE_DIR}/Tests/FindBoost/TestHeaders" + "${CMake_BINARY_DIR}/Tests/FindBoost/TestHeaders" + ${build_generator_args} + --build-project TestFindBoostHeaders + --build-options ${build_options} + --test-command ${CMAKE_CTEST_COMMAND} -V -C $<CONFIGURATION> + ) diff --git a/Tests/FindBoost/TestHeaders/CMakeLists.txt b/Tests/FindBoost/TestHeaders/CMakeLists.txt new file mode 100644 index 0000000..d7be327 --- /dev/null +++ b/Tests/FindBoost/TestHeaders/CMakeLists.txt @@ -0,0 +1,10 @@ +cmake_minimum_required(VERSION 3.1) +project(TestFindBoostHeaders CXX) +include(CTest) + +find_package(Boost REQUIRED) + +add_executable(test_boost_headers_tgt main.cxx) +target_link_libraries(test_boost_headers_tgt + Boost::boost) +add_test(NAME test_boost_headers_tgt COMMAND test_boost_headers_tgt) diff --git a/Tests/FindBoost/TestHeaders/main.cxx b/Tests/FindBoost/TestHeaders/main.cxx new file mode 100644 index 0000000..0400d6d --- /dev/null +++ b/Tests/FindBoost/TestHeaders/main.cxx @@ -0,0 +1,9 @@ +#include <boost/any.hpp> + +int main() { + boost::any a; + a = 5; + a = std::string("A string"); + + return 0; +} |