[Cmake-commits] CMake branch, next, updated. v3.6.0-rc2-446-g6f8e4c7

[Brad King]

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  6f8e4c7361a20da3e73c60c93f3c63753923205d (commit)
       via  c9fca42fd1e14536d68bd600fc4c394d2630f7f5 (commit)
      from  5788e4c44d269df999ad2f8a316d99a7a664b156 (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=6f8e4c7361a20da3e73c60c93f3c63753923205d
commit 6f8e4c7361a20da3e73c60c93f3c63753923205d
Merge: 5788e4c c9fca42
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Jun 20 10:15:51 2016 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Jun 20 10:15:51 2016 -0400

    Merge topic 'FindBoost-imported-fallback-to-release' into next
    
    c9fca42f FindBoost: Make imported targets fall back to `Release`


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c9fca42fd1e14536d68bd600fc4c394d2630f7f5
commit c9fca42fd1e14536d68bd600fc4c394d2630f7f5
Author:     Andreas Weis <github at ghulbus-inc.de>
AuthorDate: Sun Jun 19 12:44:29 2016 +0200
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Jun 20 10:14:10 2016 -0400

    FindBoost: Make imported targets fall back to `Release`
    
    FindBoost only detects Debug and Release configurations.  All other
    configurations will fall back to the configuration listed as the first
    entry in `IMPORTED_CONFIGURATIONS`.  Switch the order so that `Release`
    is listed first, as this is a better fallback than `Debug` for the
    `RelWithDebInfo` and `MinSizeRel` configurations.  See issue #16091.

diff --git a/Modules/FindBoost.cmake b/Modules/FindBoost.cmake
index 6bf6401..2560459 100644
--- a/Modules/FindBoost.cmake
+++ b/Modules/FindBoost.cmake
@@ -1734,13 +1734,6 @@ if(Boost_FOUND)
             IMPORTED_LINK_INTERFACE_LANGUAGES "CXX"
             IMPORTED_LOCATION "${Boost_${UPPERCOMPONENT}_LIBRARY}")
         endif()
-        if(EXISTS "${Boost_${UPPERCOMPONENT}_LIBRARY_DEBUG}")
-          set_property(TARGET Boost::${COMPONENT} APPEND PROPERTY
-            IMPORTED_CONFIGURATIONS DEBUG)
-          set_target_properties(Boost::${COMPONENT} PROPERTIES
-            IMPORTED_LINK_INTERFACE_LANGUAGES_DEBUG "CXX"
-            IMPORTED_LOCATION_DEBUG "${Boost_${UPPERCOMPONENT}_LIBRARY_DEBUG}")
-        endif()
         if(EXISTS "${Boost_${UPPERCOMPONENT}_LIBRARY_RELEASE}")
           set_property(TARGET Boost::${COMPONENT} APPEND PROPERTY
             IMPORTED_CONFIGURATIONS RELEASE)
@@ -1748,6 +1741,13 @@ if(Boost_FOUND)
             IMPORTED_LINK_INTERFACE_LANGUAGES_RELEASE "CXX"
             IMPORTED_LOCATION_RELEASE "${Boost_${UPPERCOMPONENT}_LIBRARY_RELEASE}")
         endif()
+        if(EXISTS "${Boost_${UPPERCOMPONENT}_LIBRARY_DEBUG}")
+          set_property(TARGET Boost::${COMPONENT} APPEND PROPERTY
+            IMPORTED_CONFIGURATIONS DEBUG)
+          set_target_properties(Boost::${COMPONENT} PROPERTIES
+            IMPORTED_LINK_INTERFACE_LANGUAGES_DEBUG "CXX"
+            IMPORTED_LOCATION_DEBUG "${Boost_${UPPERCOMPONENT}_LIBRARY_DEBUG}")
+        endif()
         if(_Boost_${UPPERCOMPONENT}_DEPENDENCIES)
           unset(_Boost_${UPPERCOMPONENT}_TARGET_DEPENDENCIES)
           foreach(dep ${_Boost_${UPPERCOMPONENT}_DEPENDENCIES})

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

Summary of changes:
 Modules/FindBoost.cmake |   14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)


hooks/post-receive
-- 
CMake