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
via cae7d6db19197200455de775d457d0cbd4bb655d (commit)
via 7db05f426e2c3a5b4d1a29ae97f5a75692bc03ac (commit)
via 6eabac26f5c8167481be9c872210a8142ead4b99 (commit)
from 0655d616d6e11b6e490b4cea2f1367caec36c4e2 (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=cae7d6db19197200455de775d457d0cbd4bb655d
commit cae7d6db19197200455de775d457d0cbd4bb655d
Merge: 0655d61 7db05f4
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Wed Jan 11 09:25:59 2017 -0500
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Wed Jan 11 09:25:59 2017 -0500
Merge topic 'Autogen_Simplify' into next
7db05f42 AUTOGEN: Release notes for SKIP_AUTOX
6eabac26 AUTOGEN: Documentation update: cmake-qt, AUTOMOC, AUTOUIC, AUTORCC
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7db05f426e2c3a5b4d1a29ae97f5a75692bc03ac
commit 7db05f426e2c3a5b4d1a29ae97f5a75692bc03ac
Author: Sebastian Holtermann <sebh...@xwmw.org>
AuthorDate: Mon Jan 2 18:02:53 2017 +0100
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Wed Jan 11 09:25:48 2017 -0500
AUTOGEN: Release notes for SKIP_AUTOX
diff --git a/Help/release/dev/QtAutogen_Skip.rst
b/Help/release/dev/QtAutogen_Skip.rst
new file mode 100644
index 0000000..37f795c
--- /dev/null
+++ b/Help/release/dev/QtAutogen_Skip.rst
@@ -0,0 +1,12 @@
+QtAutogen_Skip
+--------------
+
+* The source file properties
+ :prop_sf:`SKIP_AUTOMOC`,
+ :prop_sf:`SKIP_AUTOUIC`,
+ :prop_sf:`SKIP_AUTORCC` and
+ :prop_sf:`SKIP_AUTOGEN`
+ allow to exclude files from
+ :prop_tgt:`AUTOMOC`,
+ :prop_tgt:`AUTOUIC` and
+ :prop_tgt:`AUTORCC` processing.
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6eabac26f5c8167481be9c872210a8142ead4b99
commit 6eabac26f5c8167481be9c872210a8142ead4b99
Author: Sebastian Holtermann <sebh...@xwmw.org>
AuthorDate: Mon Jan 2 17:45:17 2017 +0100
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Wed Jan 11 09:25:48 2017 -0500
AUTOGEN: Documentation update: cmake-qt, AUTOMOC, AUTOUIC, AUTORCC
diff --git a/Help/manual/cmake-qt.7.rst b/Help/manual/cmake-qt.7.rst
index 80b0f49..56d4ca7 100644
--- a/Help/manual/cmake-qt.7.rst
+++ b/Help/manual/cmake-qt.7.rst
@@ -83,6 +83,9 @@ following targets by setting the :variable:`CMAKE_AUTOMOC`
variable. The
options to pass to ``moc``. The :variable:`CMAKE_AUTOMOC_MOC_OPTIONS`
variable may be populated to pre-set the options for all following targets.
+Source C++ files can be excluded from :prop_tgt:`AUTOMOC` processing by
+enabling :prop_sf:`SKIP_AUTOMOC` or the broader :prop_sf:`SKIP_AUTOGEN`.
+
.. _`Qt AUTOUIC`:
AUTOUIC
@@ -149,6 +152,9 @@ result of linking with the :prop_tgt:`IMPORTED` target:
Qt5::Widgets
)
+Source files can be excluded from :prop_tgt:`AUTOUIC` processing by
+enabling :prop_sf:`SKIP_AUTOUIC` or the broader :prop_sf:`SKIP_AUTOGEN`.
+
.. _`Qt AUTORCC`:
AUTORCC
@@ -171,6 +177,9 @@ populated to pre-set the options for all following targets.
The
``<name>.qrc`` file to set particular options for the file. This
overrides options from the :prop_tgt:`AUTORCC_OPTIONS` target property.
+Source files can be excluded from :prop_tgt:`AUTORCC` processing by
+enabling :prop_sf:`SKIP_AUTORCC` or the broader :prop_sf:`SKIP_AUTOGEN`.
+
qtmain.lib on Windows
=====================
diff --git a/Help/prop_tgt/AUTOMOC.rst b/Help/prop_tgt/AUTOMOC.rst
index 30a39b1..b42643f 100644
--- a/Help/prop_tgt/AUTOMOC.rst
+++ b/Help/prop_tgt/AUTOMOC.rst
@@ -47,5 +47,8 @@ See the documentation for this variable for more details.
The global property :prop_gbl:`AUTOGEN_TARGETS_FOLDER` can be used to group the
automoc targets together in an IDE, e.g. in MSVS.
+Source C++ files can be excluded from :prop_tgt:`AUTOMOC` processing by
+enabling :prop_sf:`SKIP_AUTOMOC` or the broader :prop_sf:`SKIP_AUTOGEN`.
+
See the :manual:`cmake-qt(7)` manual for more information on using CMake
with Qt.
diff --git a/Help/prop_tgt/AUTORCC.rst b/Help/prop_tgt/AUTORCC.rst
index 158fdf8..1ad0895 100644
--- a/Help/prop_tgt/AUTORCC.rst
+++ b/Help/prop_tgt/AUTORCC.rst
@@ -24,5 +24,8 @@ generate unspecified unique names for ``rcc``. Therefore if
``Q_INIT_RESOURCE()`` or ``Q_CLEANUP_RESOURCE()`` need to be used the
``.qrc`` file name must be unique.
+Source files can be excluded from :prop_tgt:`AUTORCC` processing by
+enabling :prop_sf:`SKIP_AUTORCC` or the broader :prop_sf:`SKIP_AUTOGEN`.
+
See the :manual:`cmake-qt(7)` manual for more information on using CMake
with Qt.
diff --git a/Help/prop_tgt/AUTOUIC.rst b/Help/prop_tgt/AUTOUIC.rst
index 4e60ec3..fbf24c3 100644
--- a/Help/prop_tgt/AUTOUIC.rst
+++ b/Help/prop_tgt/AUTOUIC.rst
@@ -20,5 +20,8 @@ Additional command line options for ``uic`` can be set via the
The global property :prop_gbl:`AUTOGEN_TARGETS_FOLDER` can be used to group the
autouic targets together in an IDE, e.g. in MSVS.
+Source files can be excluded from :prop_tgt:`AUTOUIC` processing by
+enabling :prop_sf:`SKIP_AUTOUIC` or the broader :prop_sf:`SKIP_AUTOGEN`.
+
See the :manual:`cmake-qt(7)` manual for more information on using CMake
with Qt.
-----------------------------------------------------------------------
Summary of changes:
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
