[Cmake-commits] CMake branch, master, updated. v3.9.0-353-gab17dc6
Kitware Robot
kwrobot at kitware.com
Thu Jul 27 17:05: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, master has been updated
via ab17dc6befdde5cebafc83f198793dd751454ea0 (commit)
via eddbd62d0f7a1cbc6ae3eb1e6c79b955125502d4 (commit)
from 1ed58b686c0f7b8690e89e1b6a7ffd6fb6dcee60 (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=ab17dc6befdde5cebafc83f198793dd751454ea0
commit ab17dc6befdde5cebafc83f198793dd751454ea0
Merge: 1ed58b6 eddbd62
Author: Craig Scott <craig.scott at crascit.com>
AuthorDate: Thu Jul 27 20:59:35 2017 +0000
Commit: Kitware Robot <kwrobot at kitware.com>
CommitDate: Thu Jul 27 16:59:39 2017 -0400
Merge topic 'FindBoost'
eddbd62d FindBoost: pop policy stack before returning
Acked-by: Kitware Robot <kwrobot at kitware.com>
Merge-request: !1078
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=eddbd62d0f7a1cbc6ae3eb1e6c79b955125502d4
commit eddbd62d0f7a1cbc6ae3eb1e6c79b955125502d4
Author: Cristian Adam <cristian.adam at here.com>
AuthorDate: Mon Jul 24 11:34:34 2017 +0200
Commit: Craig Scott <craig.scott at crascit.com>
CommitDate: Thu Jul 27 07:49:48 2017 +1000
FindBoost: pop policy stack before returning
CMake would give a fatal error if the policy stack was cleaned up
upon exiting the module.
diff --git a/Modules/FindBoost.cmake b/Modules/FindBoost.cmake
index cc273e0..b4abf75 100644
--- a/Modules/FindBoost.cmake
+++ b/Modules/FindBoost.cmake
@@ -244,6 +244,8 @@ if (NOT Boost_NO_BOOST_CMAKE)
message("Found Boost components:")
message(" ${Boost_FIND_COMPONENTS}")
endif()
+ # Restore project's policies
+ cmake_policy(POP)
return()
endif()
endif()
-----------------------------------------------------------------------
Summary of changes:
Modules/FindBoost.cmake | 2 ++
1 file changed, 2 insertions(+)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list