[Cmake-commits] CMake branch, next, updated. v3.8.0-rc2-359-ge532884
Kitware Robot
kwrobot at kitware.com
Mon Mar 6 10:35:07 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 2eec08c0c8297fabab5d3f84bc6f53ca98b08b65 (commit)
discards 5cf284282e51f6e5b6ad9777ef58f4ba6cb0e9d6 (commit)
discards 1b1bccc06db42727cf0d8d7f21215081c78e8fb3 (commit)
discards ef4e1e86441b515c60b4a1dfcf1c1e5e66ca1d76 (commit)
discards 28878dbdd49dce43a15a98062696af30f26800cf (commit)
discards 59dd1e390e1fdc1391cd81c08a300716a8a6c10c (commit)
discards 614917f70e292763b14b1c388e92714bac31fa9c (commit)
discards 505ed4e76f3043cdb5d45effc4791455136560df (commit)
discards eae0b2823cb000db9a78881a517538a8a7fb7286 (commit)
discards c511576c620ecbc614591722ad1b381c8a7d2528 (commit)
discards 4ef593ed4940229437dbbad7707a6461846318f8 (commit)
discards bdec46b75eb93427aafb70d2d5e9d6601fda26a4 (commit)
discards c52eecc303f8cb3de406d788914a2071cef4e60f (commit)
discards 86e4fcadd5edc38a9291366de61ca9fe63eae4f8 (commit)
discards 04ecb9a1df0ec91c1e6eb0eefb3719b84ac85dab (commit)
discards f9531b373f27367ac0d8c4beae474768b7745b59 (commit)
discards 100723035ac228187e60f549dd38c8f89c447b40 (commit)
via e532884e84cc22a99a9321f966f205db3a0fee84 (commit)
via a55ed1a37c74a7a112e6c355af0658b5d89dede1 (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 (2eec08c0c8297fabab5d3f84bc6f53ca98b08b65)
\
N -- N -- N (e532884e84cc22a99a9321f966f205db3a0fee84)
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=e532884e84cc22a99a9321f966f205db3a0fee84
commit e532884e84cc22a99a9321f966f205db3a0fee84
Merge: a55ed1a c3eb88e
Author: Brad King <brad.king at kitware.com>
AuthorDate: Fri Mar 3 18:58:53 2017 +0000
Commit: Kitware Robot <kwrobot at kitware.com>
CommitDate: Mon Mar 6 10:31:49 2017 -0500
Stage topic 'working-directory-fixes'
Topic-id: 22824
Topic-url: https://gitlab.kitware.com/cmake/cmake/merge_requests/540
-----------------------------------------------------------------------
Summary of changes:
Source/CMakeLists.txt | 2 -
Source/cmQtAutoGeneratorCommon.cxx | 215 ---------
Source/cmQtAutoGeneratorCommon.h | 34 --
Source/cmQtAutoGeneratorInitializer.cxx | 472 ++++++++++++--------
Source/cmQtAutoGenerators.cxx | 225 ++++------
Source/cmQtAutoGenerators.h | 2 +-
Tests/QtAutogen/CMakeLists.txt | 98 ++--
.../{mocRerun => automoc_rerun}/CMakeLists.txt | 14 +-
.../{mocRerun => automoc_rerun}/input.txt | 0
.../QtAutogen/{mocRerun => automoc_rerun}/res1.qrc | 0
.../automoc_rerun/test1.cpp} | 1 +
Tests/QtAutogen/automoc_rerun/test1.h.in1 | 8 +
Tests/QtAutogen/automoc_rerun/test1.h.in2 | 7 +
.../{rccDepends => autorcc_depends}/CMakeLists.txt | 15 +-
.../{rccDepends => autorcc_depends}/res1.qrc.in | 0
.../res1/input.txt.in} | 0
.../{rccDepends => autorcc_depends}/test_res1.cpp | 0
Tests/QtAutogen/mocDepends/CMakeLists.txt | 45 --
Tests/QtAutogen/mocDepends/invalid.hpp.in | 1 -
Tests/QtAutogen/mocDepends/object.hpp.in | 14 -
Tests/QtAutogen/mocDepends/simpleLib.cpp.in | 9 -
Tests/QtAutogen/mocDepends/simpleLib.hpp.in | 11 -
Tests/QtAutogen/mocDepends/test1.cpp | 9 -
Tests/QtAutogen/mocDepends/test2.cpp | 10 -
Tests/QtAutogen/mocDepends/test2.hpp | 16 -
Tests/QtAutogen/mocRerun/main.cpp.in | 18 -
Tests/QtAutogen/mocRerun/test1a.h.in | 8 -
Tests/QtAutogen/mocRerun/test1b.h.in | 7 -
Tests/QtAutogen/rccDepends/res/input2.txt.in | 1 -
Tests/QtAutogen/rccDepends/res2.qrc.in | 5 -
30 files changed, 439 insertions(+), 808 deletions(-)
delete mode 100644 Source/cmQtAutoGeneratorCommon.cxx
delete mode 100644 Source/cmQtAutoGeneratorCommon.h
rename Tests/QtAutogen/{mocRerun => automoc_rerun}/CMakeLists.txt (51%)
rename Tests/QtAutogen/{mocRerun => automoc_rerun}/input.txt (100%)
rename Tests/QtAutogen/{mocRerun => automoc_rerun}/res1.qrc (100%)
copy Tests/{BuildDepends/Project/object_depends.cxx => QtAutogen/automoc_rerun/test1.cpp} (58%)
create mode 100644 Tests/QtAutogen/automoc_rerun/test1.h.in1
create mode 100644 Tests/QtAutogen/automoc_rerun/test1.h.in2
rename Tests/QtAutogen/{rccDepends => autorcc_depends}/CMakeLists.txt (51%)
rename Tests/QtAutogen/{rccDepends => autorcc_depends}/res1.qrc.in (100%)
rename Tests/QtAutogen/{rccDepends/res/input1.txt.in => autorcc_depends/res1/input.txt.in} (100%)
rename Tests/QtAutogen/{rccDepends => autorcc_depends}/test_res1.cpp (100%)
delete mode 100644 Tests/QtAutogen/mocDepends/CMakeLists.txt
delete mode 100644 Tests/QtAutogen/mocDepends/invalid.hpp.in
delete mode 100644 Tests/QtAutogen/mocDepends/object.hpp.in
delete mode 100644 Tests/QtAutogen/mocDepends/simpleLib.cpp.in
delete mode 100644 Tests/QtAutogen/mocDepends/simpleLib.hpp.in
delete mode 100644 Tests/QtAutogen/mocDepends/test1.cpp
delete mode 100644 Tests/QtAutogen/mocDepends/test2.cpp
delete mode 100644 Tests/QtAutogen/mocDepends/test2.hpp
delete mode 100644 Tests/QtAutogen/mocRerun/main.cpp.in
delete mode 100644 Tests/QtAutogen/mocRerun/test1a.h.in
delete mode 100644 Tests/QtAutogen/mocRerun/test1b.h.in
delete mode 100644 Tests/QtAutogen/rccDepends/res/input2.txt.in
delete mode 100644 Tests/QtAutogen/rccDepends/res2.qrc.in
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list