[Cmake-commits] CMake branch, next, updated. v3.5.0-457-g3337c49

[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  3337c49d44f8962652073e0f936c095262f58be5 (commit)
       via  7bb4b2a6bdfca07fa7738a2304758841ee6070d6 (commit)
      from  8754d10c32cb1451e30f194f2f479cc7b783d609 (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=3337c49d44f8962652073e0f936c095262f58be5
commit 3337c49d44f8962652073e0f936c095262f58be5
Merge: 8754d10 7bb4b2a
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Mar 15 09:54:52 2016 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Mar 15 09:54:52 2016 -0400

    Merge topic 'FindBoost-optional-indirect-depends' into next
    
    7bb4b2a6 fixup! FindBoost: Tolerate missing indirect dependencies (#16013)


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7bb4b2a6bdfca07fa7738a2304758841ee6070d6
commit 7bb4b2a6bdfca07fa7738a2304758841ee6070d6
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Mar 15 09:54:37 2016 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Mar 15 09:54:37 2016 -0400

    fixup! FindBoost: Tolerate missing indirect dependencies (#16013)

diff --git a/Modules/FindBoost.cmake b/Modules/FindBoost.cmake
index c6feda7..728dcdf 100644
--- a/Modules/FindBoost.cmake
+++ b/Modules/FindBoost.cmake
@@ -775,7 +775,9 @@ function(_Boost_MISSING_DEPENDENCIES componentvar extravar)
     unset(_boost_new_components)
   endwhile()
   set(_boost_extra_components ${_boost_processed_components})
-  list(REMOVE_ITEM _boost_extra_components ${${componentvar}})
+  if(_boost_extra_components AND ${componentvar})
+    list(REMOVE_ITEM _boost_extra_components ${${componentvar}})
+  endif()
   set(${componentvar} ${_boost_processed_components} PARENT_SCOPE)
   set(${extravar} ${_boost_extra_components} PARENT_SCOPE)
 endfunction()
@@ -1488,8 +1490,10 @@ if(Boost_FOUND)
       list(APPEND _Boost_MISSING_COMPONENTS ${COMPONENT})
     endif()
   endforeach()
-  # Optional indirect dependencies are not counted as missing.
-  list(REMOVE_ITEM _Boost_MISSING_COMPONENTS ${_Boost_EXTRA_FIND_COMPONENTS})
+  if(_Boost_MISSING_COMPONENTS AND _Boost_EXTRA_FIND_COMPONENTS)
+    # Optional indirect dependencies are not counted as missing.
+    list(REMOVE_ITEM _Boost_MISSING_COMPONENTS ${_Boost_EXTRA_FIND_COMPONENTS})
+  endif()
 
   if(Boost_DEBUG)
     message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] Boost_FOUND = ${Boost_FOUND}")

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

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


hooks/post-receive
-- 
CMake