[Cmake-commits] CMake branch, master, updated. v2.8.12-522-gfcbe435
Brad King
brad.king at kitware.com
Mon Oct 28 15:23:12 EDT 2013
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 fcbe435c235f4fe1e5444a796f085c7a796be88e (commit)
via 9c87d9cc3e7a046f79ff62eda81203ef424e4a14 (commit)
via 84218e1870ab075c9e2be1f2947358702c849fed (commit)
via 94a0ca604ca6ba3699b6d309938e881b2a3984a0 (commit)
via 18fb7588df5b380340423eb36a90a7aefc1fa6ca (commit)
via e485ba12193d36ffc4faee89bb80dbe611ad7e82 (commit)
via 7ce65c3c9738414213ae307005277c774daea669 (commit)
via 32771fc7ca959a90ef5e267831650323f3c0cf13 (commit)
via f371ab5803b3d675170f4b163701d707e56b47d9 (commit)
via 85b3d6e73d1d5620229c7fc67a705fd50c8bcff0 (commit)
via ca124a15150b5f88a9dcd9edfc4f61cf473efc64 (commit)
via a342c9ffedb865919b7a13b5620caecbb5076865 (commit)
via 98632effebc7ed59105a67c549989265a3b207f1 (commit)
via 63378baa1ceacbfdd52753e6dc7228ccfc53f4e5 (commit)
via 97f1aa39da3e56ea4839e918f05928440d9d9dfa (commit)
via 4abb111584c4f0738cd2858cfa7d3adee5248a83 (commit)
via 03878c9a22719eb8e86025c3cb489af8fd47a250 (commit)
via be23dcfeb1ef2d855bd24bb933ae7da4a6b4b9da (commit)
via 52d5d4e9154644597630ed844a254dfb8de524dd (commit)
via 5c058c8f12742dcb96b2e22b43208f345a865fbf (commit)
from 16df2456a440d87fb3e8e53fb59a2817b288b9af (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=fcbe435c235f4fe1e5444a796f085c7a796be88e
commit fcbe435c235f4fe1e5444a796f085c7a796be88e
Merge: 16df245 9c87d9c
Author: Brad King <brad.king at kitware.com>
AuthorDate: Mon Oct 28 15:23:09 2013 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Oct 28 15:23:09 2013 -0400
Merge topic 'Qt-auto-generators'
9c87d9c Add automatic rcc invocation for Qt.
84218e1 Add automatic uic invocation for Qt.
94a0ca6 Record which files are skipped by automoc.
18fb758 Run the main executable created in the autogen tests.
e485ba1 Rename the QtAutomoc tests to QtAutogen.
7ce65c3 Add extra checks for the AUTOMOC target property.
32771fc Update output messages for generic use.
f371ab5 Rename RunAutomoc to RunAutogen.
85b3d6e Extract an SetupAutoMocTarget method.
ca124a1 Rename the AutomocInfo.cmake file to be more generic.
a342c9f Move some makefile definitions up away from moc-specific code.
98632ef Add the AUTOGEN_TARGETS_FOLDER and obsolete AUTOMOC_TARGETS_FOLDER.
63378ba Rename some variables to reflect broader scope.
97f1aa3 Rename method to reflect generic use.
4abb111 Rename local variable to reflect generic use.
03878c9 Move variable set to where it is used.
...
-----------------------------------------------------------------------
Summary of changes:
Help/manual/cmake-properties.7.rst | 7 +
Help/manual/cmake-variables.7.rst | 4 +
Help/prop_gbl/AUTOGEN_TARGETS_FOLDER.rst | 8 +
Help/prop_gbl/AUTOMOC_TARGETS_FOLDER.rst | 2 +
Help/prop_sf/AUTORCC_OPTIONS.rst | 14 +
Help/prop_sf/AUTOUIC_OPTIONS.rst | 14 +
Help/prop_tgt/AUTORCC.rst | 21 +
Help/prop_tgt/AUTORCC_OPTIONS.rst | 17 +
Help/prop_tgt/AUTOUIC.rst | 22 +
Help/prop_tgt/AUTOUIC_OPTIONS.rst | 17 +
Help/variable/CMAKE_AUTORCC.rst | 7 +
Help/variable/CMAKE_AUTORCC_OPTIONS.rst | 7 +
Help/variable/CMAKE_AUTOUIC.rst | 7 +
Help/variable/CMAKE_AUTOUIC_OPTIONS.rst | 7 +
Modules/AutogenInfo.cmake.in | 24 +
Modules/AutomocInfo.cmake.in | 14 -
Source/CMakeLists.txt | 4 +-
Source/cmGlobalGenerator.cxx | 27 +-
Source/cmGlobalGenerator.h | 2 +-
Source/cmMakefile.cxx | 12 +
Source/cmMakefile.h | 5 +
Source/cmQtAutoGenerators.cxx | 2008 ++++++++++++++++++++
Source/cmQtAutoGenerators.h | 131 ++
Source/cmQtAutomoc.cxx | 1317 -------------
Source/cmQtAutomoc.h | 96 -
Source/cmSourceFile.cxx | 11 +
Source/cmTarget.cxx | 4 +
Source/cmcmd.cxx | 10 +-
Tests/CMakeLists.txt | 37 +-
Tests/{QtAutomoc => QtAutogen}/Adir/CMakeLists.txt | 0
Tests/{QtAutomoc => QtAutogen}/Adir/libA.cpp | 0
Tests/{QtAutomoc => QtAutogen}/Adir/libA.h | 0
Tests/{QtAutomoc => QtAutogen}/Bdir/CMakeLists.txt | 0
Tests/{QtAutomoc => QtAutogen}/Bdir/libB.cpp | 0
Tests/{QtAutomoc => QtAutogen}/Bdir/libB.h | 0
Tests/QtAutogen/CMakeLists.txt | 73 +
Tests/{QtAutomoc => QtAutogen}/abc.cpp | 0
Tests/{QtAutomoc => QtAutogen}/abc.h | 0
Tests/{QtAutomoc => QtAutogen}/abc_p.h | 0
Tests/{QtAutomoc => QtAutogen}/bar.cpp | 0
Tests/{QtAutomoc => QtAutogen}/blub.cpp | 0
Tests/{QtAutomoc => QtAutogen}/blub.h | 0
Tests/QtAutogen/calwidget.cpp | 434 +++++
Tests/QtAutogen/calwidget.h | 128 ++
Tests/QtAutogen/calwidget.ui | 32 +
Tests/{QtAutomoc => QtAutogen}/codeeditor.cpp | 0
Tests/{QtAutomoc => QtAutogen}/codeeditor.h | 0
.../defines_test/CMakeLists.txt | 0
.../defines_test/defines_test.cpp | 0
Tests/{QtAutomoc => QtAutogen}/empty.cpp | 0
Tests/{QtAutomoc => QtAutogen}/empty.h | 0
Tests/{QtAutomoc => QtAutogen}/foo.cpp | 0
Tests/{QtAutomoc => QtAutogen}/foo.h | 0
Tests/{QtAutomoc => QtAutogen}/gadget.cpp | 0
Tests/{QtAutomoc => QtAutogen}/gadget.h | 0
Tests/{QtAutomoc => QtAutogen}/libC.cpp | 0
Tests/{QtAutomoc => QtAutogen}/libC.h | 0
Tests/QtAutogen/main.cpp | 85 +
Tests/{QtAutomoc => QtAutogen}/private_slot.cpp | 0
Tests/{QtAutomoc => QtAutogen}/private_slot.h | 0
Tests/QtAutogen/resourcetester.cpp | 21 +
Tests/QtAutogen/resourcetester.h | 17 +
Tests/{QtAutomoc => QtAutogen}/sub/bar.h | 0
Tests/QtAutogen/test.qrc | 5 +
Tests/{QtAutomoc => QtAutogen}/xyz.cpp | 0
Tests/{QtAutomoc => QtAutogen}/xyz.h | 0
Tests/{QtAutomoc => QtAutogen}/yaf.cpp | 0
Tests/{QtAutomoc => QtAutogen}/yaf.h | 0
Tests/{QtAutomoc => QtAutogen}/yaf_p.h | 0
Tests/QtAutomoc/CMakeLists.txt | 68 -
Tests/QtAutomoc/calwidget.cpp | 431 -----
Tests/QtAutomoc/calwidget.h | 121 --
Tests/QtAutomoc/main.cpp | 86 -
73 files changed, 3190 insertions(+), 2167 deletions(-)
create mode 100644 Help/prop_gbl/AUTOGEN_TARGETS_FOLDER.rst
create mode 100644 Help/prop_sf/AUTORCC_OPTIONS.rst
create mode 100644 Help/prop_sf/AUTOUIC_OPTIONS.rst
create mode 100644 Help/prop_tgt/AUTORCC.rst
create mode 100644 Help/prop_tgt/AUTORCC_OPTIONS.rst
create mode 100644 Help/prop_tgt/AUTOUIC.rst
create mode 100644 Help/prop_tgt/AUTOUIC_OPTIONS.rst
create mode 100644 Help/variable/CMAKE_AUTORCC.rst
create mode 100644 Help/variable/CMAKE_AUTORCC_OPTIONS.rst
create mode 100644 Help/variable/CMAKE_AUTOUIC.rst
create mode 100644 Help/variable/CMAKE_AUTOUIC_OPTIONS.rst
create mode 100644 Modules/AutogenInfo.cmake.in
delete mode 100644 Modules/AutomocInfo.cmake.in
create mode 100644 Source/cmQtAutoGenerators.cxx
create mode 100644 Source/cmQtAutoGenerators.h
delete mode 100644 Source/cmQtAutomoc.cxx
delete mode 100644 Source/cmQtAutomoc.h
rename Tests/{QtAutomoc => QtAutogen}/Adir/CMakeLists.txt (100%)
rename Tests/{QtAutomoc => QtAutogen}/Adir/libA.cpp (100%)
rename Tests/{QtAutomoc => QtAutogen}/Adir/libA.h (100%)
rename Tests/{QtAutomoc => QtAutogen}/Bdir/CMakeLists.txt (100%)
rename Tests/{QtAutomoc => QtAutogen}/Bdir/libB.cpp (100%)
rename Tests/{QtAutomoc => QtAutogen}/Bdir/libB.h (100%)
create mode 100644 Tests/QtAutogen/CMakeLists.txt
rename Tests/{QtAutomoc => QtAutogen}/abc.cpp (100%)
rename Tests/{QtAutomoc => QtAutogen}/abc.h (100%)
rename Tests/{QtAutomoc => QtAutogen}/abc_p.h (100%)
rename Tests/{QtAutomoc => QtAutogen}/bar.cpp (100%)
rename Tests/{QtAutomoc => QtAutogen}/blub.cpp (100%)
rename Tests/{QtAutomoc => QtAutogen}/blub.h (100%)
create mode 100644 Tests/QtAutogen/calwidget.cpp
create mode 100644 Tests/QtAutogen/calwidget.h
create mode 100644 Tests/QtAutogen/calwidget.ui
rename Tests/{QtAutomoc => QtAutogen}/codeeditor.cpp (100%)
rename Tests/{QtAutomoc => QtAutogen}/codeeditor.h (100%)
rename Tests/{QtAutomoc => QtAutogen}/defines_test/CMakeLists.txt (100%)
rename Tests/{QtAutomoc => QtAutogen}/defines_test/defines_test.cpp (100%)
rename Tests/{QtAutomoc => QtAutogen}/empty.cpp (100%)
rename Tests/{QtAutomoc => QtAutogen}/empty.h (100%)
rename Tests/{QtAutomoc => QtAutogen}/foo.cpp (100%)
rename Tests/{QtAutomoc => QtAutogen}/foo.h (100%)
rename Tests/{QtAutomoc => QtAutogen}/gadget.cpp (100%)
rename Tests/{QtAutomoc => QtAutogen}/gadget.h (100%)
rename Tests/{QtAutomoc => QtAutogen}/libC.cpp (100%)
rename Tests/{QtAutomoc => QtAutogen}/libC.h (100%)
create mode 100644 Tests/QtAutogen/main.cpp
rename Tests/{QtAutomoc => QtAutogen}/private_slot.cpp (100%)
rename Tests/{QtAutomoc => QtAutogen}/private_slot.h (100%)
create mode 100644 Tests/QtAutogen/resourcetester.cpp
create mode 100644 Tests/QtAutogen/resourcetester.h
rename Tests/{QtAutomoc => QtAutogen}/sub/bar.h (100%)
create mode 100644 Tests/QtAutogen/test.qrc
rename Tests/{QtAutomoc => QtAutogen}/xyz.cpp (100%)
rename Tests/{QtAutomoc => QtAutogen}/xyz.h (100%)
rename Tests/{QtAutomoc => QtAutogen}/yaf.cpp (100%)
rename Tests/{QtAutomoc => QtAutogen}/yaf.h (100%)
rename Tests/{QtAutomoc => QtAutogen}/yaf_p.h (100%)
delete mode 100644 Tests/QtAutomoc/CMakeLists.txt
delete mode 100644 Tests/QtAutomoc/calwidget.cpp
delete mode 100644 Tests/QtAutomoc/calwidget.h
delete mode 100644 Tests/QtAutomoc/main.cpp
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list