[Cmake-commits] CMake branch, next, updated. v3.5.0-455-g8754d10

[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  8754d10c32cb1451e30f194f2f479cc7b783d609 (commit)
       via  17a1faa7635257cab799a492128d61bde4b376a0 (commit)
      from  eba19623c552ec9fe6b073a821a4655d13d363b5 (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=8754d10c32cb1451e30f194f2f479cc7b783d609
commit 8754d10c32cb1451e30f194f2f479cc7b783d609
Merge: eba1962 17a1faa
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Mar 15 09:45:07 2016 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Mar 15 09:45:07 2016 -0400

    Merge topic 'FindBoost-optional-depends' into next
    
    17a1faa7 FindBoost: Tolerate missing indirect dependencies (#16013)


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=17a1faa7635257cab799a492128d61bde4b376a0
commit 17a1faa7635257cab799a492128d61bde4b376a0
Author:     Roger Leigh <rleigh at dundee.ac.uk>
AuthorDate: Mon Mar 14 13:49:39 2016 +0000
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Mar 14 14:32:48 2016 -0400

    FindBoost: Tolerate missing indirect dependencies (#16013)
    
    Depending upon the configuration, certain components may or may not
    be installed, for example Boost.Regex, but other components may
    still have header dependencies upon these components which will
    obviously fail to work.  Since we can't make a sensible
    determination with the hardcoded dependency information, we
    choose to interpret these dependencies less strictly.

diff --git a/Modules/FindBoost.cmake b/Modules/FindBoost.cmake
index c3058ea..c6feda7 100644
--- a/Modules/FindBoost.cmake
+++ b/Modules/FindBoost.cmake
@@ -745,9 +745,10 @@ endfunction()
 # defined; FALSE if dependency information is unavailable).
 #
 # componentvar - the component list variable name
+# extravar - the indirect dependency list variable name
 #
 #
-function(_Boost_MISSING_DEPENDENCIES componentvar)
+function(_Boost_MISSING_DEPENDENCIES componentvar extravar)
   # _boost_unprocessed_components - list of components requiring processing
   # _boost_processed_components - components already processed (or currently being processed)
   # _boost_new_components - new components discovered for future processing
@@ -773,7 +774,10 @@ function(_Boost_MISSING_DEPENDENCIES componentvar)
     set(_boost_unprocessed_components ${_boost_new_components})
     unset(_boost_new_components)
   endwhile()
+  set(_boost_extra_components ${_boost_processed_components})
+  list(REMOVE_ITEM _boost_extra_components ${${componentvar}})
   set(${componentvar} ${_boost_processed_components} PARENT_SCOPE)
+  set(${extravar} ${_boost_extra_components} PARENT_SCOPE)
 endfunction()
 
 #
@@ -1306,7 +1310,7 @@ endif()
 
 # Additional components may be required via component dependencies.
 # Add any missing components to the list.
-_Boost_MISSING_DEPENDENCIES(Boost_FIND_COMPONENTS)
+_Boost_MISSING_DEPENDENCIES(Boost_FIND_COMPONENTS _Boost_EXTRA_FIND_COMPONENTS)
 
 # If thread is required, get the thread libs as a dependency
 list(FIND Boost_FIND_COMPONENTS thread _Boost_THREAD_DEPENDENCY_LIBS)
@@ -1484,6 +1488,8 @@ 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_DEBUG)
     message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] Boost_FOUND = ${Boost_FOUND}")

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

Summary of changes:


hooks/post-receive
-- 
CMake