[Cmake-commits] CMake branch, master, updated. v3.8.0-rc1-237-gdfebdd6
Brad King
brad.king at kitware.com
Wed Feb 22 10:15:51 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, master has been updated
via dfebdd6218d8f146277d75597fccde74b45cdbd2 (commit)
via 29d96633a405c2848a70ce5931973be2d518b56f (commit)
via d60f1ddc39e55f0d2e9d073fe5cca19ced6d08f6 (commit)
via cdb72127dcd281fdce8e349118d7de717b7154b2 (commit)
via 8b13a52c4964b09f663e462af7882cbd01b8202a (commit)
via 9d1db7d7c3696108fd0fa1162893076d9a59b652 (commit)
via 0ab817fa1e1c9bae8aa63c331d4483d9d9b190c5 (commit)
via 754d431813fb4726ca2460641d826240387eb718 (commit)
via cd74daf06f3b12f78bf7aed95ed06ff221a28da3 (commit)
via 39c4819eaa4f680411a63701b1303d79a088aece (commit)
via 50805693ba987fbf86bb5e8263d7b427cd4da0c2 (commit)
via c23206b6c17a5c70580355904fc12fd64c26ef79 (commit)
via 347572cf5ea2c653cba6150b5e6d6fa083a68cb0 (commit)
via 03df033bfa551e83c2a265cc22f6f5278c80528b (commit)
via 3ec230de1f45f48a8bbb8eca49674f0e0c99dfa1 (commit)
via 41fb64e719817ce877565e6e11198df2f7e7e63d (commit)
via 175c89004425cdbb151d4e85876e2a2076432f28 (commit)
via 80a007534f6287cd2e88c1b8fd72b68fc688da4e (commit)
via f379fdbb9ee17b62ac8b4a8d4b9fab562ba37253 (commit)
via ddf940725e8af095b1c02606aeea64cc9baaf572 (commit)
via 71c5ae253cb5498da319e36bcf49869509b6603c (commit)
via 5308f954c9ad13cfc6cc84f1f1255fb5faff48c6 (commit)
via 887e40034161589b63fdb14bfaee7f66374b9b83 (commit)
via 4c60099fea2b06229900cc16fed907185c4fe2ef (commit)
via 815a05cf12499b42acea70b5a9534e10e1701417 (commit)
via 3270091210c0cfdddb133209b232a1d0a1fa48da (commit)
via 793c9a7925dfa3aaa2b15212f4ba0246d1fbf83c (commit)
via 25dbfbc2a937379ca78328dfabdf54043340dbd3 (commit)
via 3cc42863a43cd4256efdeb2eda2d235d5533bad9 (commit)
via 074534a56d4d6146c2389fd256299197e5bad027 (commit)
via a51f1a91d9733c596113f799154ef45d647e7764 (commit)
via b2063fd70fa6955acb2b9f02507097d03e2011a7 (commit)
via 10beb4a0345f673feaeec798d452a48797c6820a (commit)
via f37f1a647d5aba4de5903a3a3dc7700be55c99ec (commit)
via 5bb997c24a7ba8b6f252cc7914858f5c12a543b6 (commit)
via a9e3c903b6f74d181c76d1a2014a3af2babe6e41 (commit)
via 2f3ecd4ea9518b2a110b995fe9ac171f026ccad5 (commit)
via 739592c9256fb6f89ee15081c3944d42515ef8db (commit)
via ad1f21313f553ecc7064accf582986112dc678d1 (commit)
via 2296a2e9ee04fc83a294d51421038dca40b3150f (commit)
via d3a9887149d638dd23df2b46ff67a90cd91d33fe (commit)
via 6ae09b7c1473836236275e553fe9ff77f48306c1 (commit)
via 9a7c9efeea0c2c2dfa20eb46dc75359c7f787629 (commit)
via 86c2b552ad7bb3af97bb3c59576ddc7cac841d26 (commit)
via 2fed7bcc1f4a19f4942cddfdd42278f1c20feccc (commit)
via c29950cc1f532d78158b146c50b0c49b8d41c47a (commit)
via 74a2fcff50356dcdcd4004664a2b2b81a8142660 (commit)
via 21886ff66a8a84c20a3c7f24601b5a353d8c7d06 (commit)
via 22faeef2626e10b281c82d10ba2653ecd940f398 (commit)
via 32d0ee3576c9203104a17c6a75bfc1bf13192045 (commit)
via 119876e6d5e71fb8a3f72ba35593ee43fd124203 (commit)
via c88a3f72289a1fdfb9b47cdea025d50efee94501 (commit)
via 25f0c2e14b0285d81ad0c6be401398e12e7ea89e (commit)
via 763f717ce2251a7237e85a0ad9a4c86c94942642 (commit)
via 3ee2b1623ecbef3164c412bb6a1d826ba788002b (commit)
via ec24dcdb36db7b460113b2ce3f7a954800d41e90 (commit)
via 6b31416d6c9bdc8b89a918f217a6678cc6083fed (commit)
via 1bd74130f2a804d073081f7e3e4f307c3fecb07c (commit)
from dc32ad198819a1f25487daa1787f08825bbafef8 (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 -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=dfebdd6218d8f146277d75597fccde74b45cdbd2
commit dfebdd6218d8f146277d75597fccde74b45cdbd2
Merge: dc32ad1 29d9663
Author: Brad King <brad.king at kitware.com>
AuthorDate: Wed Feb 22 10:15:48 2017 -0500
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Feb 22 10:15:48 2017 -0500
Merge topic 'autogen_json'
29d96633 Autogen: Don't use .moc include in Q_PLUGIN_METADATA test
d60f1ddc Autogen: Documentation update
cdb72127 Autogen: Add release notes for Q_PLUGIN_METADATA support
8b13a52c Autogen: Tests: Set different compression levels in rcc test
9d1db7d7 Autogen: Overhaul and simplify AutogenInfo.cmake file generation
0ab817fa Autogen: Optimize GetCompileDefinitionsAndDirectories function
754d4318 Autogen: Sort AutogenInfo.cmake.in
cd74daf0 Autogen: Tests: Add Q_PLUGIN_METADATA test
39c4819e Autogen: Tests: Add moc include tests
50805693 Autogen: Tests: Clean comments
c23206b6 Autogen: Log simplifications
347572cf Autogen: Only touch an unchanged moc_compilation.cpp
03df033b Autogen: Rebuild moc when Q_PLUGIN_METADATA json file changes
3ec230de Autogen: Use GetRealPath in central places only
41fb64e7 Autogen: Search moc includes in include directories
175c8900 Autogen: Sort includes before composing include options
...
-----------------------------------------------------------------------
Summary of changes:
Help/manual/cmake-qt.7.rst | 22 +-
Help/prop_tgt/AUTOMOC.rst | 54 +-
Help/release/dev/Autogen_json.rst | 10 +
Modules/AutogenInfo.cmake.in | 36 +-
Source/cmFilePathChecksum.cxx | 4 +-
Source/cmFilePathChecksum.h | 4 +-
Source/cmQtAutoGeneratorInitializer.cxx | 671 ++++-----
Source/cmQtAutoGenerators.cxx | 1576 ++++++++++++----------
Source/cmQtAutoGenerators.h | 170 ++-
Tests/QtAutogen/CMakeLists.txt | 91 +-
Tests/QtAutogen/mocInclude/ObjA.cpp | 24 +
Tests/QtAutogen/mocInclude/ObjA.hpp | 13 +
Tests/QtAutogen/mocInclude/ObjB.cpp | 25 +
Tests/QtAutogen/mocInclude/ObjB.hpp | 13 +
Tests/QtAutogen/mocInclude/ObjC.cpp | 26 +
Tests/QtAutogen/mocInclude/ObjC.hpp | 13 +
Tests/QtAutogen/mocInclude/ObjD.cpp | 26 +
Tests/QtAutogen/mocInclude/ObjD.hpp | 13 +
Tests/QtAutogen/mocInclude/subA/SubObjA.cpp | 27 +
Tests/QtAutogen/mocInclude/subA/SubObjA.hpp | 16 +
Tests/QtAutogen/mocInclude/subB/SubObjB.cpp | 27 +
Tests/QtAutogen/mocInclude/subB/SubObjB.hpp | 16 +
Tests/QtAutogen/mocInclude/subC/SubObjC.cpp | 27 +
Tests/QtAutogen/mocInclude/subC/SubObjC.hpp | 16 +
Tests/QtAutogen/mocIncludeRelaxed/CMakeLists.txt | 18 +
Tests/QtAutogen/mocIncludeRelaxed/main.cpp | 14 +
Tests/QtAutogen/mocIncludeStrict/CMakeLists.txt | 18 +
Tests/QtAutogen/mocIncludeStrict/main.cpp | 14 +
Tests/QtAutogen/mocPlugin/CMakeLists.txt | 25 +
Tests/QtAutogen/mocPlugin/StyleA.cpp | 6 +
Tests/QtAutogen/mocPlugin/StyleA.hpp | 15 +
Tests/QtAutogen/mocPlugin/StyleA.json | 1 +
Tests/QtAutogen/mocPlugin/StyleB.cpp | 6 +
Tests/QtAutogen/mocPlugin/StyleB.hpp | 15 +
Tests/QtAutogen/mocPlugin/StyleC.cpp | 6 +
Tests/QtAutogen/mocPlugin/StyleC.hpp | 15 +
Tests/QtAutogen/mocPlugin/StyleD.cpp | 6 +
Tests/QtAutogen/mocPlugin/StyleD.hpp | 15 +
Tests/QtAutogen/mocPlugin/StyleE.cpp | 6 +
Tests/QtAutogen/mocPlugin/StyleE.hpp | 15 +
Tests/QtAutogen/mocPlugin/jsonIn/StyleB.json | 1 +
Tests/QtAutogen/mocPlugin/jsonIn/StyleC.json | 1 +
Tests/QtAutogen/mocPlugin/jsonIn/StyleD.json | 1 +
Tests/QtAutogen/mocPlugin/main.cpp | 6 +
Tests/QtAutogen/sameName/CMakeLists.txt | 11 +
45 files changed, 1960 insertions(+), 1175 deletions(-)
create mode 100644 Help/release/dev/Autogen_json.rst
create mode 100644 Tests/QtAutogen/mocInclude/ObjA.cpp
create mode 100644 Tests/QtAutogen/mocInclude/ObjA.hpp
create mode 100644 Tests/QtAutogen/mocInclude/ObjB.cpp
create mode 100644 Tests/QtAutogen/mocInclude/ObjB.hpp
create mode 100644 Tests/QtAutogen/mocInclude/ObjC.cpp
create mode 100644 Tests/QtAutogen/mocInclude/ObjC.hpp
create mode 100644 Tests/QtAutogen/mocInclude/ObjD.cpp
create mode 100644 Tests/QtAutogen/mocInclude/ObjD.hpp
create mode 100644 Tests/QtAutogen/mocInclude/subA/SubObjA.cpp
create mode 100644 Tests/QtAutogen/mocInclude/subA/SubObjA.hpp
create mode 100644 Tests/QtAutogen/mocInclude/subB/SubObjB.cpp
create mode 100644 Tests/QtAutogen/mocInclude/subB/SubObjB.hpp
create mode 100644 Tests/QtAutogen/mocInclude/subC/SubObjC.cpp
create mode 100644 Tests/QtAutogen/mocInclude/subC/SubObjC.hpp
create mode 100644 Tests/QtAutogen/mocIncludeRelaxed/CMakeLists.txt
create mode 100644 Tests/QtAutogen/mocIncludeRelaxed/main.cpp
create mode 100644 Tests/QtAutogen/mocIncludeStrict/CMakeLists.txt
create mode 100644 Tests/QtAutogen/mocIncludeStrict/main.cpp
create mode 100644 Tests/QtAutogen/mocPlugin/CMakeLists.txt
create mode 100644 Tests/QtAutogen/mocPlugin/StyleA.cpp
create mode 100644 Tests/QtAutogen/mocPlugin/StyleA.hpp
create mode 100644 Tests/QtAutogen/mocPlugin/StyleA.json
create mode 100644 Tests/QtAutogen/mocPlugin/StyleB.cpp
create mode 100644 Tests/QtAutogen/mocPlugin/StyleB.hpp
create mode 100644 Tests/QtAutogen/mocPlugin/StyleC.cpp
create mode 100644 Tests/QtAutogen/mocPlugin/StyleC.hpp
create mode 100644 Tests/QtAutogen/mocPlugin/StyleD.cpp
create mode 100644 Tests/QtAutogen/mocPlugin/StyleD.hpp
create mode 100644 Tests/QtAutogen/mocPlugin/StyleE.cpp
create mode 100644 Tests/QtAutogen/mocPlugin/StyleE.hpp
create mode 100644 Tests/QtAutogen/mocPlugin/jsonIn/StyleB.json
create mode 100644 Tests/QtAutogen/mocPlugin/jsonIn/StyleC.json
create mode 100644 Tests/QtAutogen/mocPlugin/jsonIn/StyleD.json
create mode 100644 Tests/QtAutogen/mocPlugin/main.cpp
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list