[Cmake-commits] CMake branch, next, updated. v3.8.0-784-gd4bf4d3
Kitware Robot
kwrobot at kitware.com
Tue Apr 18 10:55:03 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
discards 48facf8259e4db190bc342aad8585153c86a5a5e (commit)
discards 4fb5157b5f8fb12cf7875008808a1a2b1bb50aec (commit)
discards 54eb4b7ae819e7f4843808c28e0d780cb8244961 (commit)
discards b06152a999ba3bc13a3101512957d6af08c2c968 (commit)
discards 0630596a69dd402b34d063963c480770e974849e (commit)
discards 11008293a02e140328c5403caa11c4edaa281ff5 (commit)
discards a61f06761673627658421d20d3db5aa7b712cbc9 (commit)
discards 227f708bb3e245eef4a1c00cf5dc3e4119820225 (commit)
discards 58fcdf325b2f1e26c69495f74962a3db6553f062 (commit)
discards 3ab4681efa6db7339af36218fffea165ad1186f3 (commit)
via d4bf4d3c05e4a1e5b2c96bd2ed6ba9406a30810e (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 (48facf8259e4db190bc342aad8585153c86a5a5e)
\
N -- N -- N (d4bf4d3c05e4a1e5b2c96bd2ed6ba9406a30810e)
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=d4bf4d3c05e4a1e5b2c96bd2ed6ba9406a30810e
commit d4bf4d3c05e4a1e5b2c96bd2ed6ba9406a30810e
Merge: afc492d 05e1bcb
Author: Brad King <brad.king at kitware.com>
AuthorDate: Tue Apr 18 14:26:42 2017 +0000
Commit: Kitware Robot <kwrobot at kitware.com>
CommitDate: Tue Apr 18 10:45:59 2017 -0400
Stage topic 'autogen-fixes'
Topic-id: 23520
Topic-url: https://gitlab.kitware.com/cmake/cmake/merge_requests/671
-----------------------------------------------------------------------
Summary of changes:
Help/command/add_library.rst | 9 +-
Help/command/install.rst | 23 +++--
Help/manual/cmake-buildsystem.7.rst | 12 +--
Help/manual/cmake-generator-expressions.7.rst | 4 +-
Help/manual/cmake-properties.7.rst | 2 -
Help/prop_tgt/IMPORTED_OBJECTS.rst | 11 ---
Help/prop_tgt/IMPORTED_OBJECTS_CONFIG.rst | 7 --
.../dev/add_custom_command-TARGET_OBJECTS.rst | 6 --
Help/release/dev/add_library-TARGET_OBJECTS.rst | 5 --
Help/release/dev/file-GENERATE-TARGET_OBJECTS.rst | 6 --
Help/release/dev/install-TARGET_OBJECTS.rst | 8 --
Source/cmAddLibraryCommand.cxx | 13 +--
Source/cmExportBuildFileGenerator.cxx | 57 ++++---------
Source/cmExportCommand.cxx | 14 ++--
Source/cmExportFileGenerator.cxx | 8 --
Source/cmExportInstallFileGenerator.cxx | 19 -----
Source/cmGeneratorExpressionEvaluationFile.cxx | 6 +-
Source/cmGeneratorExpressionNode.cxx | 79 ++++++++----------
Source/cmGeneratorTarget.cxx | 40 ---------
Source/cmGeneratorTarget.h | 11 +--
Source/cmGlobalGenerator.h | 5 --
Source/cmGlobalXCodeGenerator.cxx | 12 ---
Source/cmGlobalXCodeGenerator.h | 2 -
Source/cmInstallCommand.cxx | 50 ++---------
Source/cmInstallTargetGenerator.cxx | 88 +++++---------------
Source/cmInstallTargetGenerator.h | 6 --
Source/cmTarget.cxx | 30 +++----
Source/cmTargetExport.h | 1 -
Source/cmVisualStudio10TargetGenerator.cxx | 3 +-
Tests/ExportImport/Export/CMakeLists.txt | 13 +--
Tests/ExportImport/Export/sub/testLib8C.c | 4 -
Tests/ExportImport/Export/testLib8A.c | 4 -
Tests/ExportImport/Export/testLib8B.c | 4 -
Tests/ExportImport/Import/A/CMakeLists.txt | 8 --
Tests/ExportImport/Import/A/imp_testExe1.c | 24 +++---
Tests/ExportImport/Import/A/imp_testLib8.c | 8 --
Tests/GeneratorExpression/CMakeLists.txt | 22 -----
Tests/GeneratorExpression/check_object_files.cmake | 30 -------
Tests/GeneratorExpression/objlib1.c | 4 -
Tests/GeneratorExpression/objlib2.c | 4 -
.../File_Generate/OutputConflict-stderr.txt | 5 +-
.../OutputNameDoesntMatchObjects-result.txt | 1 -
.../OutputNameDoesntMatchObjects-stderr.txt | 6 --
.../OutputNameDoesntMatchObjects.cmake | 14 ----
.../OutputNameMatchesObjects-result.txt | 2 +-
.../OutputNameMatchesObjects-stderr.txt | 9 ++
.../File_Generate/OutputNameMatchesObjects.cmake | 6 +-
Tests/RunCMake/File_Generate/RunCMakeTest.cmake | 5 +-
.../Export-result.txt} | 0
Tests/RunCMake/ObjectLibrary/Export-stderr.txt | 4 +
.../ObjectLibrary/ExportNotSupported-result.txt | 1 -
.../ObjectLibrary/ExportNotSupported-stderr.txt | 5 --
.../ObjectLibrary/ExportNotSupported.cmake | 2 -
.../Import-result.txt} | 0
...rtNotSupported-stderr.txt => Import-stderr.txt} | 5 +-
Tests/RunCMake/ObjectLibrary/Import.cmake | 11 ---
.../ObjectLibrary/ImportNotSupported-result.txt | 1 -
.../ObjectLibrary/ImportNotSupported.cmake | 1 -
.../Install-result.txt} | 0
...lNotSupported-stderr.txt => Install-stderr.txt} | 5 +-
.../ObjectLibrary/InstallNotSupported-result.txt | 1 -
.../ObjectLibrary/InstallNotSupported.cmake | 2 -
Tests/RunCMake/ObjectLibrary/RunCMakeTest.cmake | 12 +--
Tests/RunCMake/ObjectLibrary/b.c | 4 -
Tests/RunCMake/TargetObjects/BadContext-stderr.txt | 9 +-
Tests/RunCMake/TargetObjects/NoTarget-result.txt | 1 -
Tests/RunCMake/TargetObjects/NoTarget-stderr.txt | 8 --
Tests/RunCMake/TargetObjects/NoTarget.cmake | 5 --
.../TargetObjects/NotObjlibTarget-result.txt | 1 -
.../TargetObjects/NotObjlibTarget-stderr.txt | 8 --
Tests/RunCMake/TargetObjects/NotObjlibTarget.cmake | 3 -
Tests/RunCMake/TargetObjects/RunCMakeTest.cmake | 7 +-
Tests/RunCMake/TargetObjects/empty.cpp | 7 --
73 files changed, 167 insertions(+), 646 deletions(-)
delete mode 100644 Help/prop_tgt/IMPORTED_OBJECTS.rst
delete mode 100644 Help/prop_tgt/IMPORTED_OBJECTS_CONFIG.rst
delete mode 100644 Help/release/dev/add_custom_command-TARGET_OBJECTS.rst
delete mode 100644 Help/release/dev/add_library-TARGET_OBJECTS.rst
delete mode 100644 Help/release/dev/file-GENERATE-TARGET_OBJECTS.rst
delete mode 100644 Help/release/dev/install-TARGET_OBJECTS.rst
delete mode 100644 Tests/ExportImport/Export/sub/testLib8C.c
delete mode 100644 Tests/ExportImport/Export/testLib8A.c
delete mode 100644 Tests/ExportImport/Export/testLib8B.c
delete mode 100644 Tests/ExportImport/Import/A/imp_testLib8.c
delete mode 100644 Tests/GeneratorExpression/check_object_files.cmake
delete mode 100644 Tests/GeneratorExpression/objlib1.c
delete mode 100644 Tests/GeneratorExpression/objlib2.c
delete mode 100644 Tests/RunCMake/File_Generate/OutputNameDoesntMatchObjects-result.txt
delete mode 100644 Tests/RunCMake/File_Generate/OutputNameDoesntMatchObjects-stderr.txt
delete mode 100644 Tests/RunCMake/File_Generate/OutputNameDoesntMatchObjects.cmake
create mode 100644 Tests/RunCMake/File_Generate/OutputNameMatchesObjects-stderr.txt
copy Tests/RunCMake/{Android/BadSYSROOT-result.txt => ObjectLibrary/Export-result.txt} (100%)
create mode 100644 Tests/RunCMake/ObjectLibrary/Export-stderr.txt
delete mode 100644 Tests/RunCMake/ObjectLibrary/ExportNotSupported-result.txt
delete mode 100644 Tests/RunCMake/ObjectLibrary/ExportNotSupported-stderr.txt
delete mode 100644 Tests/RunCMake/ObjectLibrary/ExportNotSupported.cmake
copy Tests/RunCMake/{Android/BadSYSROOT-result.txt => ObjectLibrary/Import-result.txt} (100%)
rename Tests/RunCMake/ObjectLibrary/{ImportNotSupported-stderr.txt => Import-stderr.txt} (55%)
delete mode 100644 Tests/RunCMake/ObjectLibrary/ImportNotSupported-result.txt
delete mode 100644 Tests/RunCMake/ObjectLibrary/ImportNotSupported.cmake
copy Tests/RunCMake/{Android/BadSYSROOT-result.txt => ObjectLibrary/Install-result.txt} (100%)
rename Tests/RunCMake/ObjectLibrary/{InstallNotSupported-stderr.txt => Install-stderr.txt} (54%)
delete mode 100644 Tests/RunCMake/ObjectLibrary/InstallNotSupported-result.txt
delete mode 100644 Tests/RunCMake/ObjectLibrary/InstallNotSupported.cmake
delete mode 100644 Tests/RunCMake/ObjectLibrary/b.c
delete mode 100644 Tests/RunCMake/TargetObjects/NoTarget-result.txt
delete mode 100644 Tests/RunCMake/TargetObjects/NoTarget-stderr.txt
delete mode 100644 Tests/RunCMake/TargetObjects/NoTarget.cmake
delete mode 100644 Tests/RunCMake/TargetObjects/NotObjlibTarget-result.txt
delete mode 100644 Tests/RunCMake/TargetObjects/NotObjlibTarget-stderr.txt
delete mode 100644 Tests/RunCMake/TargetObjects/NotObjlibTarget.cmake
delete mode 100644 Tests/RunCMake/TargetObjects/empty.cpp
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list