From 2c1b720e643aafd725a8c0be11913834704d7269 Mon Sep 17 00:00:00 2001
From: Roger Leigh <r.leigh@dundee.ac.uk>
Date: Sun, 17 Apr 2016 16:24:51 +0100
Subject: [PATCH] FindBoost: Define Boost::boost for all boost versions

---
 Modules/FindBoost.cmake                    |   4 ++--
 Tests/CFBundleTest/Localized.rsrc          | Bin 496 -> 472 bytes
 Tests/FindBoost/CMakeLists.txt             |  11 +++++++++++
 Tests/FindBoost/TestHeaders/CMakeLists.txt |  10 ++++++++++
 Tests/FindBoost/TestHeaders/main.cxx       |   9 +++++++++
 5 files changed, 32 insertions(+), 2 deletions(-)
 create mode 100644 Tests/FindBoost/TestHeaders/CMakeLists.txt
 create mode 100644 Tests/FindBoost/TestHeaders/main.cxx

diff --git a/Modules/FindBoost.cmake b/Modules/FindBoost.cmake
index 9e6083db2..38ccf78ec 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
index cbf35235b3f73416f2f0eb6003e75b58409b9c00..7973c1fbf7ed269e7a32adbaee68d9322d73603e 100644
GIT binary patch
literal 472
zcmZQzU}RumVC(}DAnXOiBMq1`FiELYyEz4i1bO<o$NQwFC+0Zk7gQEyre~DYiX%w{
z6y>LsCYSgn=BCyHLrIQ-Q5s3sEi)(8CAB!YD6^m>Gd~ZcLZ5+21WARjr>|>BWkD*6
up&)Ip6(y;8CB+~u*ntcvW`GV<W?*9AVyOH7AFiw(%(evc8^G*n5E}rbhc<fv

literal 496
zcmZQzU}RumU|a?yK-de2M;b6<U{Z3<FQ_caOwTA$FfuT(RB+2IN=+(CO)SY!a7isw
z2uV%M<#BTgNi8l3$SF<F%mW6I7Xza^k}{B-0z^_l7sg1-FH$H0N@V7xD<tORC}if9
zq!y(mCZ`rFB<7_kqya4`ElMp0nkL7<B$ZfDkdv95Sdy8ar(dC)mITsS0J9E9q{x6`
eEI1@cnSqIci=poSf4I7OFxw2wZveAfKx_bAl|fwq

diff --git a/Tests/FindBoost/CMakeLists.txt b/Tests/FindBoost/CMakeLists.txt
index 259ee266f..0e9527de0 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 000000000..d7be32703
--- /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 000000000..0400d6dc9
--- /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;
+}