[Cmake-commits] CMake branch, next, updated. v3.7.2-2413-ga38022e
Brad King
brad.king at kitware.com
Mon Jan 30 09:31:43 EST 2017
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 a38022e786f751fea0785f45df9a611cbf863b34 (commit)
via 97d61562d064af4e79ed51cfe4ef4ea95f780b23 (commit)
from a3faf127a169cad512f9d6c67adfa1d8cc781f11 (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=a38022e786f751fea0785f45df9a611cbf863b34
commit a38022e786f751fea0785f45df9a611cbf863b34
Merge: a3faf12 97d6156
Author: Brad King <brad.king at kitware.com>
AuthorDate: Mon Jan 30 09:31:42 2017 -0500
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Jan 30 09:31:42 2017 -0500
Merge topic 'FindBoost-cache-unset-on-change' into next
97d61562 FindBoost: unset cache variables if the lib dir changes
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=97d61562d064af4e79ed51cfe4ef4ea95f780b23
commit 97d61562d064af4e79ed51cfe4ef4ea95f780b23
Author: Yves Frederix <yves.frederix at gmail.com>
AuthorDate: Mon Jan 30 11:53:42 2017 +0100
Commit: Brad King <brad.king at kitware.com>
CommitDate: Mon Jan 30 09:29:28 2017 -0500
FindBoost: unset cache variables if the lib dir changes
This fixes a regression introduced by commit v3.3.0-rc1~5^2~2
(FindBoost: Search for debug and release libraries separately,
2015-01-26). The `_Boost_CHANGE_LIBDIR` variable was split into
`_Boost_CHANGE_LIBDIR_{DEBUG,RELEASE}` but one usage site was not
updated.
diff --git a/Modules/FindBoost.cmake b/Modules/FindBoost.cmake
index 266d135..e795aad 100644
--- a/Modules/FindBoost.cmake
+++ b/Modules/FindBoost.cmake
@@ -1463,7 +1463,7 @@ if(NOT _Boost_THREAD_DEPENDENCY_LIBS EQUAL -1)
endif()
# If the user changed any of our control inputs flush previous results.
-if(_Boost_CHANGE_LIBDIR OR _Boost_CHANGE_LIBNAME)
+if(_Boost_CHANGE_LIBDIR_DEBUG OR _Boost_CHANGE_LIBDIR_RELEASE OR _Boost_CHANGE_LIBNAME)
foreach(COMPONENT ${_Boost_COMPONENTS_SEARCHED})
string(TOUPPER ${COMPONENT} UPPERCOMPONENT)
foreach(c DEBUG RELEASE)
-----------------------------------------------------------------------
Summary of changes:
Modules/FindBoost.cmake | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list