[Cmake-commits] CMake branch, next, updated. v3.8.0-rc4-697-g9070df6
Kitware Robot
kwrobot at kitware.com
Thu Apr 6 14:15:02 EDT 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 9070df6981bb012ff0bbb90620aa06b2c6e7e3a9 (commit)
via 6115875bf0faef61c558e46395e67bdfd4ad48e1 (commit)
from da9fe11b98ae9b176c1fbee8afb2cacddacf0c11 (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=9070df6981bb012ff0bbb90620aa06b2c6e7e3a9
commit 9070df6981bb012ff0bbb90620aa06b2c6e7e3a9
Merge: da9fe11 6115875
Author: Brad King <brad.king at kitware.com>
AuthorDate: Thu Apr 6 18:05:29 2017 +0000
Commit: Kitware Robot <kwrobot at kitware.com>
CommitDate: Thu Apr 6 14:05:31 2017 -0400
Stage topic 'FindBoost-fix-release-names'
Topic-id: 23525
Topic-url: https://gitlab.kitware.com/cmake/cmake/merge_requests/673
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6115875bf0faef61c558e46395e67bdfd4ad48e1
commit 6115875bf0faef61c558e46395e67bdfd4ad48e1
Author: yume todo <yume-wikijp at live.jp>
AuthorDate: Thu Apr 6 23:58:37 2017 +0900
Commit: Brad King <brad.king at kitware.com>
CommitDate: Thu Apr 6 14:03:26 2017 -0400
FindBoost: Fix release name candidate list construction
Changes in commit 3ca6f70f (FindBoost: Allow testing for multiple
compiler suffixes, 2017-03-28) accidentally left a `set()` instead of a
`list(APPEND)` while constructing `_boost_RELEASE_NAMES`. Fix the logic
to match what was done for `_boost_DEBUG_NAMES`. Otherwise we drop some
of the candidate names.
diff --git a/Modules/FindBoost.cmake b/Modules/FindBoost.cmake
index 1d75720..c3cf341 100644
--- a/Modules/FindBoost.cmake
+++ b/Modules/FindBoost.cmake
@@ -1544,7 +1544,7 @@ foreach(COMPONENT ${Boost_FIND_COMPONENTS})
${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${compiler}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG}-${Boost_LIB_VERSION}
${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${compiler}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG} )
endforeach()
- set(_boost_RELEASE_NAMES
+ list(APPEND _boost_RELEASE_NAMES
${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG}-${Boost_LIB_VERSION}
${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG}
${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT} )
-----------------------------------------------------------------------
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