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 08da4f8d70cce97a9a6913d74e6c128ca6c0a40b (commit)
via bacb20a3364e6a868cc47720f4a5c9831103af42 (commit)
via 34e011748e796972be4a7386207b2a203d6f282f (commit)
via c384fc3ca4e4523efa7330d7684f5cf3de672826 (commit)
via a567f533dbbcb0d41ac38837f2593059a456fe5e (commit)
via 4ccf278f5bc9815f76f393948c09f82092e9f1ec (commit)
via eb52529ff41d375344c2bd45a717bf86669627f8 (commit)
via 9855a80fd41e384bc3accd07fa8b98f7da7d916d (commit)
from fa5e5550f3f19842590b2d9e19b3c3e3c1132e02 (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=08da4f8d70cce97a9a6913d74e6c128ca6c0a40b
commit 08da4f8d70cce97a9a6913d74e6c128ca6c0a40b
Merge: bacb20a 9855a80
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Fri Nov 2 11:53:16 2018 +0000
Commit: Kitware Robot <kwro...@kitware.com>
CommitDate: Fri Nov 2 07:53:22 2018 -0400
Merge topic 'FindBoost-exact-version'
9855a80fd4 FindBoost: search default path if Boost_FIND_VERSION_EXACT
Acked-by: Kitware Robot <kwro...@kitware.com>
Merge-request: !2543
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=bacb20a3364e6a868cc47720f4a5c9831103af42
commit bacb20a3364e6a868cc47720f4a5c9831103af42
Merge: 34e0117 a567f53
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Fri Nov 2 07:49:13 2018 -0400
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Fri Nov 2 07:49:13 2018 -0400
Merge branch 'release-3.13'
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=34e011748e796972be4a7386207b2a203d6f282f
commit 34e011748e796972be4a7386207b2a203d6f282f
Merge: c384fc3 4ccf278
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Fri Nov 2 07:48:59 2018 -0400
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Fri Nov 2 07:48:59 2018 -0400
Merge branch 'release-3.12'
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c384fc3ca4e4523efa7330d7684f5cf3de672826
commit c384fc3ca4e4523efa7330d7684f5cf3de672826
Merge: fa5e555 eb52529
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Fri Nov 2 11:48:27 2018 +0000
Commit: Kitware Robot <kwro...@kitware.com>
CommitDate: Fri Nov 2 07:48:34 2018 -0400
Merge topic 'server-file-monitor-check'
eb52529ff4 server: Fix assertion failure on directory paths in file monitor
Acked-by: Kitware Robot <kwro...@kitware.com>
Merge-request: !2556
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4ccf278f5bc9815f76f393948c09f82092e9f1ec
commit 4ccf278f5bc9815f76f393948c09f82092e9f1ec
Merge: 609bdd1 eb52529
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Thu Nov 1 09:02:30 2018 -0400
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Thu Nov 1 09:02:30 2018 -0400
Merge branch 'server-file-monitor-check' into release-3.12
Merge-request: !2556
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9855a80fd41e384bc3accd07fa8b98f7da7d916d
commit 9855a80fd41e384bc3accd07fa8b98f7da7d916d
Author: Hannes Franke <hannes.fra...@smartoptics.de>
AuthorDate: Mon Oct 29 16:20:40 2018 +0100
Commit: Hannes Franke <hannes.fra...@smartoptics.de>
CommitDate: Mon Oct 29 16:44:40 2018 +0100
FindBoost: search default path if Boost_FIND_VERSION_EXACT
Search paths for boost versions should be build using _boost_TEST_VERSIONS
instead of _Boost_KNOWN_VERSIONS because if Boost_FIND_VERSION_EXACT
is used _Boost_KNOWN_VERSIONS is empty and boost isn't found even in its
default installation path.
Fixes: #17986
diff --git a/Modules/FindBoost.cmake b/Modules/FindBoost.cmake
index 501929a..cde3738 100644
--- a/Modules/FindBoost.cmake
+++ b/Modules/FindBoost.cmake
@@ -1258,7 +1258,7 @@ if(NOT Boost_INCLUDE_DIR)
list(APPEND _boost_INCLUDE_SEARCH_DIRS NO_CMAKE_SYSTEM_PATH
NO_SYSTEM_ENVIRONMENT_PATH)
else()
if("x${CMAKE_CXX_COMPILER_ID}" STREQUAL "xMSVC")
- foreach(ver ${_Boost_KNOWN_VERSIONS})
+ foreach(ver ${_boost_TEST_VERSIONS})
string(REPLACE "." "_" ver "${ver}")
list(APPEND _boost_INCLUDE_SEARCH_DIRS PATHS "C:/local/boost_${ver}")
endforeach()
@@ -1569,7 +1569,7 @@ foreach(c DEBUG RELEASE)
if( Boost_NO_SYSTEM_PATHS )
list(APPEND _boost_LIBRARY_SEARCH_DIRS_${c} NO_CMAKE_SYSTEM_PATH
NO_SYSTEM_ENVIRONMENT_PATH)
else()
- foreach(ver ${_Boost_KNOWN_VERSIONS})
+ foreach(ver ${_boost_TEST_VERSIONS})
string(REPLACE "." "_" ver "${ver}")
_Boost_UPDATE_WINDOWS_LIBRARY_SEARCH_DIRS_WITH_PREBUILT_PATHS(_boost_LIBRARY_SEARCH_DIRS_${c}
"C:/local/boost_${ver}")
endforeach()
-----------------------------------------------------------------------
Summary of changes:
Modules/FindBoost.cmake | 4 ++--
Source/cmFileMonitor.cxx | 3 ++-
2 files changed, 4 insertions(+), 3 deletions(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
https://cmake.org/mailman/listinfo/cmake-commits
