[Cmake-commits] CMake branch, next, updated. v3.2.2-3279-gce8abdf

[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  ce8abdf145ae5d8dd4ec232fa4b25fd21c5f3f4c (commit)
       via  b3df1e9f709df1e06e8c25be295a40ecd551103e (commit)
      from  15074cd72e26b94d69f8bb4cf450e1bf2d45dc35 (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 -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ce8abdf145ae5d8dd4ec232fa4b25fd21c5f3f4c
commit ce8abdf145ae5d8dd4ec232fa4b25fd21c5f3f4c
Merge: 15074cd b3df1e9
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Jun 1 10:14:46 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Jun 1 10:14:46 2015 -0400

    Merge topic 'FindBoost-per-config-libraries' into next
    
    b3df1e9f FindBoost: Fix Boost_LIBRARY_DIR_{RELEASE,DEBUG} cache entry configuration


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b3df1e9f709df1e06e8c25be295a40ecd551103e
commit b3df1e9f709df1e06e8c25be295a40ecd551103e
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Jun 1 10:07:55 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Jun 1 10:10:08 2015 -0400

    FindBoost: Fix Boost_LIBRARY_DIR_{RELEASE,DEBUG} cache entry configuration
    
    These cache entries introduced by commit 892b854f (FindBoost: Search for
    debug and release libraries separately, 2015-01-26) should be marked as
    advanced just as Boost_LIBRARY_DIR was.  Also their _LAST values should
    be tracked so changes can be detected reliably.  Both of these are
    handled by code looking in _Boost_VARS_LIB for a list of relevant
    variables.  Fix construction of this list that was broken by the above
    commit.
    
    Reported-by: Sylvain Joubert <joubert.sy at gmail.com>

diff --git a/Modules/FindBoost.cmake b/Modules/FindBoost.cmake
index 466090b..bf37e03 100644
--- a/Modules/FindBoost.cmake
+++ b/Modules/FindBoost.cmake
@@ -879,8 +879,10 @@ endif()
 #  Begin finding boost libraries
 # ------------------------------------------------------------------------
 
+set(_Boost_VARS_LIB "")
 foreach(c DEBUG RELEASE)
   set(_Boost_VARS_LIB_${c} BOOST_LIBRARYDIR Boost_LIBRARY_DIR_${c})
+  list(APPEND _Boost_VARS_LIB ${_Boost_VARS_LIB_${c}})
   _Boost_CHANGE_DETECT(_Boost_CHANGE_LIBDIR_${c} ${_Boost_VARS_DIR} ${_Boost_VARS_LIB_${c}} Boost_INCLUDE_DIR)
   # Clear Boost_LIBRARY_DIR_${c} if it did not change but other input affecting the
   # location did.  We will find a new one based on the new inputs.

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

Summary of changes:
 Modules/FindBoost.cmake |    2 ++
 1 file changed, 2 insertions(+)


hooks/post-receive
-- 
CMake