[Cmake-commits] CMake branch, next, updated. v3.5.2-1018-g5155d7b

[Roger Leigh]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  5155d7b2854231156b66e2359742585ce7b38973 (commit)
       via  2c1b720e643aafd725a8c0be11913834704d7269 (commit)
      from  c6ab628a0bbcd23229537a00fddbbc7bd9c617e9 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5155d7b2854231156b66e2359742585ce7b38973
commit 5155d7b2854231156b66e2359742585ce7b38973
Merge: c6ab628 2c1b720
Author:     Roger Leigh <rleigh at codelibre.net>
AuthorDate: Tue Apr 19 17:17:18 2016 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Apr 19 17:17:18 2016 -0400

    Merge topic 'boost-import-default' into next
    
    2c1b720e FindBoost: Define Boost::boost for all boost versions


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2c1b720e643aafd725a8c0be11913834704d7269
commit 2c1b720e643aafd725a8c0be11913834704d7269
Author:     Roger Leigh <r.leigh at dundee.ac.uk>
AuthorDate: Sun Apr 17 16:24:51 2016 +0100
Commit:     Roger Leigh <r.leigh at dundee.ac.uk>
CommitDate: Tue Apr 19 22:07:45 2016 +0100

    FindBoost: Define Boost::boost for all boost versions

diff --git a/Modules/FindBoost.cmake b/Modules/FindBoost.cmake
index 9e6083d..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
index cbf3523..7973c1f 100644
Binary files a/Tests/CFBundleTest/Localized.rsrc and b/Tests/CFBundleTest/Localized.rsrc differ
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;
+}

-----------------------------------------------------------------------

Summary of changes:
 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


hooks/post-receive
-- 
CMake