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
discards f0932bf2b802983f5c6b72c03fbd321bfeb0b6a6 (commit)
discards ccd7ef0b1fafe7581cb110702288cde898e18418 (commit)
discards 84804eb5b3f33d97f3ecb5902a5df280ec2d4f9e (commit)
discards 2cc0ea8d610b1b88b4494d0b39da1d6f848758ef (commit)
discards 62fe278118632236b3adcdbc0717e9f0088d331d (commit)
via 70de6381a92d919c050e2067c54a0943db2c493f (commit)
via fcd081d0e83a0d9e681e91ecadbfbb966f611856 (commit)
via 6dc7262bf77f551a7f3c36d7ca3023c63ef20af8 (commit)
via 4a6a27ad85a4be666a3bb4260105a54ba1cea0eb (commit)
via 2b9086d26614787bbc47b8ee47514583f6814e5d (commit)
via ece20f7ae84db12b4ba95768e6aa5cc7e8832585 (commit)
via 496b845a1e43117d31f33490f14215f8c94ab15d (commit)
via 8352de538725f292fea20f54efc10ead173ee3b4 (commit)
via 9defe9d63a44d99dadd440b64721f7d518dd31b6 (commit)
via eb69cd94446c9e3ce2debf9d1260a6cfad851a1f (commit)
This update added new revisions after undoing existing revisions. That is
to say, the old revision is not a strict subset of the new revision. This
situation occurs when you --force push a change and generate a repository
containing something like this:
* -- * -- B -- O -- O -- O (f0932bf2b802983f5c6b72c03fbd321bfeb0b6a6)
\
N -- N -- N (70de6381a92d919c050e2067c54a0943db2c493f)
When this happens we assume that you've already had alert emails for all
of the O revisions, and so we here report only the revisions in the N
branch from the common base, B.
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=70de6381a92d919c050e2067c54a0943db2c493f
commit 70de6381a92d919c050e2067c54a0943db2c493f
Merge: fcd081d 496b845
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Wed Mar 29 13:23:21 2017 +0000
Commit: Kitware Robot <kwro...@kitware.com>
CommitDate: Wed Mar 29 09:23:23 2017 -0400
Stage topic 'FindBoost-1.64-deps'
Topic-id: 23283
Topic-url: https://gitlab.kitware.com/cmake/cmake/merge_requests/629
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=fcd081d0e83a0d9e681e91ecadbfbb966f611856
commit fcd081d0e83a0d9e681e91ecadbfbb966f611856
Merge: 6dc7262 8e8f111
Author: Domen Vrankar <domen.vran...@gmail.com>
AuthorDate: Wed Mar 29 06:21:41 2017 +0000
Commit: Kitware Robot <kwro...@kitware.com>
CommitDate: Wed Mar 29 09:15:05 2017 -0400
Stage topic 'cmake-file-install-symlink-on-nonexistng-path'
Topic-id: 23338
Topic-url: https://gitlab.kitware.com/cmake/cmake/merge_requests/642
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=496b845a1e43117d31f33490f14215f8c94ab15d
commit 496b845a1e43117d31f33490f14215f8c94ab15d
Author: Roger Leigh <rle...@codelibre.net>
AuthorDate: Sat Mar 25 22:26:31 2017 +0000
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Tue Mar 28 10:23:16 2017 -0400
FindBoost: Add numpy dependency for 1.63
Note that 1.63 is missing the needed autolink information, so this is
a manual addition.
Fixes: #16612
diff --git a/Modules/FindBoost.cmake b/Modules/FindBoost.cmake
index b1d90c4..8b21c84 100644
--- a/Modules/FindBoost.cmake
+++ b/Modules/FindBoost.cmake
@@ -738,6 +738,7 @@ function(_Boost_COMPONENT_DEPENDENCIES component _ret)
set(_Boost_MATH_DEPENDENCIES math_c99 math_c99f math_c99l math_tr1
math_tr1f math_tr1l atomic)
set(_Boost_MPI_DEPENDENCIES serialization)
set(_Boost_MPI_PYTHON_DEPENDENCIES python mpi serialization)
+ set(_Boost_NUMPY_DEPENDENCIES python)
set(_Boost_RANDOM_DEPENDENCIES system)
set(_Boost_THREAD_DEPENDENCIES chrono system date_time atomic)
set(_Boost_WAVE_DEPENDENCIES filesystem system serialization thread chrono
date_time atomic)
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8352de538725f292fea20f54efc10ead173ee3b4
commit 8352de538725f292fea20f54efc10ead173ee3b4
Author: Roger Leigh <rle...@codelibre.net>
AuthorDate: Sat Mar 25 22:24:22 2017 +0000
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Tue Mar 28 10:23:11 2017 -0400
FindBoost: Update 1.64 dependencies using 1.64 beta1
diff --git a/Modules/FindBoost.cmake b/Modules/FindBoost.cmake
index ef8435e..b1d90c4 100644
--- a/Modules/FindBoost.cmake
+++ b/Modules/FindBoost.cmake
@@ -746,6 +746,7 @@ function(_Boost_COMPONENT_DEPENDENCIES component _ret)
set(_Boost_CHRONO_DEPENDENCIES system)
set(_Boost_CONTEXT_DEPENDENCIES thread chrono system date_time)
set(_Boost_COROUTINE_DEPENDENCIES context system)
+ set(_Boost_COROUTINE2_DEPENDENCIES context fiber thread chrono system
date_time)
set(_Boost_FIBER_DEPENDENCIES context thread chrono system date_time)
set(_Boost_FILESYSTEM_DEPENDENCIES system)
set(_Boost_IOSTREAMS_DEPENDENCIES regex)
@@ -753,6 +754,7 @@ function(_Boost_COMPONENT_DEPENDENCIES component _ret)
set(_Boost_MATH_DEPENDENCIES math_c99 math_c99f math_c99l math_tr1
math_tr1f math_tr1l atomic)
set(_Boost_MPI_DEPENDENCIES serialization)
set(_Boost_MPI_PYTHON_DEPENDENCIES python mpi serialization)
+ set(_Boost_NUMPY_DEPENDENCIES python)
set(_Boost_RANDOM_DEPENDENCIES system)
set(_Boost_THREAD_DEPENDENCIES chrono system date_time atomic)
set(_Boost_WAVE_DEPENDENCIES filesystem system serialization thread chrono
date_time atomic)
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9defe9d63a44d99dadd440b64721f7d518dd31b6
commit 9defe9d63a44d99dadd440b64721f7d518dd31b6
Author: Roger Leigh <rle...@codelibre.net>
AuthorDate: Sat Mar 25 22:30:21 2017 +0000
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Tue Mar 28 10:23:11 2017 -0400
FindBoost: Add numpy header
diff --git a/Modules/FindBoost.cmake b/Modules/FindBoost.cmake
index a6f63f5..ef8435e 100644
--- a/Modules/FindBoost.cmake
+++ b/Modules/FindBoost.cmake
@@ -812,6 +812,7 @@ function(_Boost_COMPONENT_HEADERS component _hdrs)
set(_Boost_PRG_EXEC_MONITOR_HEADERS "boost/test/prg_exec_monitor.hpp")
set(_Boost_PROGRAM_OPTIONS_HEADERS "boost/program_options.hpp")
set(_Boost_PYTHON_HEADERS "boost/python.hpp")
+ set(_Boost_NUMPY_HEADERS "boost/python/numpy.hpp")
set(_Boost_RANDOM_HEADERS "boost/random.hpp")
set(_Boost_REGEX_HEADERS "boost/regex.hpp")
set(_Boost_SERIALIZATION_HEADERS
"boost/serialization/serialization.hpp")
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=eb69cd94446c9e3ce2debf9d1260a6cfad851a1f
commit eb69cd94446c9e3ce2debf9d1260a6cfad851a1f
Author: Roger Leigh <rle...@codelibre.net>
AuthorDate: Sat Mar 25 22:22:47 2017 +0000
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Tue Mar 28 10:23:11 2017 -0400
BoostScanDeps: Add python numpy support
Additionally correct indentation.
diff --git a/Utilities/Scripts/BoostScanDeps.cmake
b/Utilities/Scripts/BoostScanDeps.cmake
index 2fd8f86..3d32ee0 100644
--- a/Utilities/Scripts/BoostScanDeps.cmake
+++ b/Utilities/Scripts/BoostScanDeps.cmake
@@ -35,19 +35,31 @@ function(_Boost_FIND_COMPONENT_DEPENDENCIES component
includedir _ret_libs)
# _boost_processed_headers - headers already parsed (or currently being
parsed)
# _boost_new_headers - new headers discovered for future processing
+ message(STATUS " Processing component ${component}")
+
set(library_component FALSE)
# Start by finding all headers for the component; header
# dependencies via #include will be solved by future passes
- # Special-case since it is part of mpi; look only in boost/mpi/python*
+ # Special-case sub-component headers
+ file(GLOB_RECURSE _mpi_python_unprocessed_headers
+ RELATIVE "${includedir}"
+ "${includedir}/boost/mpi/python.hpp"
+ "${includedir}/boost/mpi/python/*")
+ file(GLOB_RECURSE _python_numpy_unprocessed_headers
+ RELATIVE "${includedir}"
+ "${includedir}/boost/python/numpy.hpp"
+ "${includedir}/boost/python/numpy/*")
+
if(component STREQUAL "mpi_python")
set(_boost_DEPS "python")
set(library_component TRUE)
- file(GLOB_RECURSE _boost_unprocessed_headers
- RELATIVE "${includedir}"
- "${includedir}/boost/mpi/python/*")
- list(INSERT _boost_unprocessed_headers 0
"${includedir}/boost/mpi/python.hpp")
+ set(_boost_unprocessed_headers "${_mpi_python_unprocessed_headers}")
+ elseif(component STREQUAL "numpy")
+ set(_boost_DEPS "python")
+ set(library_component TRUE)
+ set(_boost_unprocessed_headers "${_python_numpy_unprocessed_headers}")
# Special-case since it is a serialization variant; look in
boost/serialization
elseif(component STREQUAL "wserialization")
set(library_component TRUE)
@@ -80,6 +92,12 @@ function(_Boost_FIND_COMPONENT_DEPENDENCIES component
includedir _ret_libs)
RELATIVE "${includedir}"
"${includedir}/boost/${component}/*")
list(INSERT _boost_unprocessed_headers 0
"${includedir}/boost/${component}.hpp")
+ if(component STREQUAL "mpi")
+ list(REMOVE_ITEM _boost_unprocessed_headers
${_mpi_python_unprocessed_headers})
+ endif()
+ if(component STREQUAL "python")
+ list(REMOVE_ITEM _boost_unprocessed_headers
${_python_numpy_unprocessed_headers})
+ endif()
endif()
while(_boost_unprocessed_headers)
@@ -168,22 +186,26 @@ if(IS_DIRECTORY "${BOOST_DIR}/boost/mpi" AND
IS_DIRECTORY "${BOOST_DIR}/boost/python")
list(APPEND boost_components "mpi_python")
endif()
+# Special-case numpy, since it's a part of python
+if(EXISTS "${BOOST_DIR}/boost/python/numpy.hpp")
+ list(APPEND boost_components "numpy")
+endif()
# Special-case wserialization, which is a variant of serialization
if(IS_DIRECTORY "${BOOST_DIR}/boost/serialization")
- list(APPEND boost_components "wserialization")
+ list(APPEND boost_components "wserialization")
endif()
# Special-case math* since there are six libraries, but no actual math
# library component. Handle specially when scanning above.
#
# Special-case separate test libraries, which are all part of test
if(EXISTS "${BOOST_DIR}/test/unit_test.hpp")
- list(APPEND boost_components "unit_test_framework")
+ list(APPEND boost_components "unit_test_framework")
endif()
if(EXISTS "${BOOST_DIR}/test/prg_exec_monitor.hpp")
- list(APPEND boost_components "prg_exec_monitor")
+ list(APPEND boost_components "prg_exec_monitor")
endif()
if(EXISTS "${BOOST_DIR}/test/test_exec_monitor.hpp")
- list(APPEND boost_components "test_exec_monitor")
+ list(APPEND boost_components "test_exec_monitor")
endif()
if(boost_components)
-----------------------------------------------------------------------
Summary of changes:
Modules/FindBoost.cmake | 4 ++++
Utilities/Scripts/BoostScanDeps.cmake | 40 +++++++++++++++++++++++++--------
2 files changed, 35 insertions(+), 9 deletions(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
