[Cmake-commits] CMake branch, next, updated. v3.8.0-rc2-406-ge66966f
Kitware Robot
kwrobot at kitware.com
Tue Mar 7 15:25:06 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
discards d0791d846e7e09fec819acb3660803cd286efa9e (commit)
discards f9867934158a7f067202d89dd683b1e8ed1010f3 (commit)
discards a2fbb872bbdf459b40c2c026077714d4aeeb33b5 (commit)
discards 68df742d4488631167bbc292200ed467780c9883 (commit)
discards de6aa5e7332f9ff3715021d8bfef9bece407c6e3 (commit)
discards b0ad0c0397d0d1b415d907e3e4ebccf9e507125d (commit)
via e66966fb2564ae0ec8eac4c1a710c34ba98033ba (commit)
via 0d5670a71e54e7d0fb387f2ff2c992fb251e3b91 (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 (d0791d846e7e09fec819acb3660803cd286efa9e)
\
N -- N -- N (e66966fb2564ae0ec8eac4c1a710c34ba98033ba)
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=e66966fb2564ae0ec8eac4c1a710c34ba98033ba
commit e66966fb2564ae0ec8eac4c1a710c34ba98033ba
Merge: 0d5670a 613b3e4
Author: Brad King <brad.king at kitware.com>
AuthorDate: Tue Mar 7 18:28:55 2017 +0000
Commit: Kitware Robot <kwrobot at kitware.com>
CommitDate: Tue Mar 7 15:24:16 2017 -0500
Stage topic 'cuda-test-spelling'
Topic-id: 22917
Topic-url: https://gitlab.kitware.com/cmake/cmake/merge_requests/563
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0d5670a71e54e7d0fb387f2ff2c992fb251e3b91
commit 0d5670a71e54e7d0fb387f2ff2c992fb251e3b91
Merge: b51484f f5c4dad
Author: Brad King <brad.king at kitware.com>
AuthorDate: Tue Mar 7 16:53:40 2017 +0000
Commit: Kitware Robot <kwrobot at kitware.com>
CommitDate: Tue Mar 7 15:24:16 2017 -0500
Stage topic 'cmake-server-aix'
Topic-id: 22915
Topic-url: https://gitlab.kitware.com/cmake/cmake/merge_requests/562
-----------------------------------------------------------------------
Summary of changes:
Help/command/find_library.rst | 10 +---------
Help/manual/cmake-properties.7.rst | 1 -
Help/prop_gbl/FIND_LIBRARY_USE_LIBX32_PATHS.rst | 12 ------------
Help/release/dev/x32-abi.rst | 6 ------
Help/variable/CMAKE_FIND_LIBRARY_CUSTOM_LIB_SUFFIX.rst | 1 -
Modules/CMakeCompilerABI.h | 4 ----
Modules/CPackRPM.cmake | 2 +-
Modules/FindDevIL.cmake | 6 +++---
Modules/FindGLEW.cmake | 2 +-
Modules/FindGTK2.cmake | 2 --
Modules/FindIce.cmake | 2 +-
Modules/FindKDE3.cmake | 2 --
Modules/FindOpenAL.cmake | 2 +-
Modules/FindPkgConfig.cmake | 4 ----
Modules/GetPrerequisites.cmake | 2 +-
Modules/Platform/UnixPaths.cmake | 1 -
Source/cmExportInstallFileGenerator.cxx | 4 +---
Source/cmFindLibraryCommand.cxx | 9 +--------
Source/cmFindPackageCommand.cxx | 11 -----------
Source/cmFindPackageCommand.h | 1 -
Source/cmMakefile.cxx | 16 ----------------
Source/cmMakefile.h | 2 --
22 files changed, 11 insertions(+), 91 deletions(-)
delete mode 100644 Help/prop_gbl/FIND_LIBRARY_USE_LIBX32_PATHS.rst
delete mode 100644 Help/release/dev/x32-abi.rst
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list