[Cmake-commits] CMake branch, master, updated. v3.2.2-801-g9efee16
Brad King
brad.king at kitware.com
Fri Apr 17 10:50:14 EDT 2015
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 9efee16a7a092555d4bc40498a1acd957943a834 (commit)
via e8fdd5f12a379ce91adcb88acdb4354bc271c911 (commit)
via 15f1a6b49958cc7757f951839b02a00e8c820154 (commit)
via 3f7c7c65968b6d04babd261dab952ee40e0c9ca9 (commit)
via 26b5cc5e79320dd73e93e117fffd0d4554e89dbc (commit)
via 4556640855515b287dd8a5a0f7fb1a85218267a8 (commit)
from f4e5a0e6aa598f7cf0f34c2d7fea54e518615443 (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 -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9efee16a7a092555d4bc40498a1acd957943a834
commit 9efee16a7a092555d4bc40498a1acd957943a834
Merge: f4e5a0e e8fdd5f
Author: Brad King <brad.king at kitware.com>
AuthorDate: Fri Apr 17 10:50:13 2015 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Apr 17 10:50:13 2015 -0400
Merge topic 'ninja-autogen'
e8fdd5f1 QtAutogen: Workaround rcc CRCRLF newlines on Windows (#15459)
15f1a6b4 Tests/QtAutogen: Avoid touching files in the source tree
3f7c7c65 Tests/QtAutogen: Help Qt5Autogen test find Qt5 on Windows
26b5cc5e Tests/QtAutogen: Enable per-config source tests when possible
45566408 Tests/QtAutogen: Require CMake 3.1 to set policies everywhere
-----------------------------------------------------------------------
Summary of changes:
Source/cmQtAutoGenerators.cxx | 7 +++++++
Tests/CMakeLists.txt | 9 +++++++--
Tests/QtAutogen/CMakeLists.txt | 17 ++++++++++++-----
Tests/QtAutogen/autorcc_depends/CMakeLists.txt | 7 +++++--
.../autorcc_depends/{res1.qrc => res1.qrc.in} | 2 +-
.../{res1_input.txt => res1/input.txt.in} | 0
6 files changed, 32 insertions(+), 10 deletions(-)
rename Tests/QtAutogen/autorcc_depends/{res1.qrc => res1.qrc.in} (61%)
rename Tests/QtAutogen/autorcc_depends/{res1_input.txt => res1/input.txt.in} (100%)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list