[Cmake-commits] CMake branch, master, updated. v3.8.0-rc1-393-gc1fb721
Brad King
brad.king at kitware.com
Thu Mar 2 09:26:15 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 c1fb7213edaf512774eb74adb0a89b4984f88904 (commit)
via 3bf28f5ed057b2fe4d90c601065188055bb052a1 (commit)
via 154d8339f77e5cd31466e5a4258c27a8aa31ff1c (commit)
via ac77fa35c0250f2f7593fd2fc499b27bf395e5a6 (commit)
via 662ad240db50792361aa042c60559c1c48042a6b (commit)
via 5adf22bbd23185808dc3295766b25b4aa15e1612 (commit)
via 36fa535d922f891deed4333b30ddbf429291ca06 (commit)
via 6d7c02db34a3a8ca9cf14fa936b5835014c46739 (commit)
via 1cdf7c1be24f87e2854204aa5bc7de4dc22af1a3 (commit)
via 110c1bf475e2d1df27189936a1e7b66b48afb5a9 (commit)
via db431ecfe33dbfa9eb43e4edd72ebc35b2c7c563 (commit)
from 6c332bd84ce320e4163130a052af7b9950b38318 (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=c1fb7213edaf512774eb74adb0a89b4984f88904
commit c1fb7213edaf512774eb74adb0a89b4984f88904
Merge: 6c332bd 3bf28f5
Author: Brad King <brad.king at kitware.com>
AuthorDate: Thu Mar 2 09:26:13 2017 -0500
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Mar 2 09:26:13 2017 -0500
Merge topic 'autogen_uic_paths'
3bf28f5e Autogen: New short InfoGet functions
154d8339 Autogen: Parse enabled feature configuration only
ac77fa35 Autogen: Add missing return on error
662ad240 Autogen: Rename and merge moc related methods
5adf22bb Autogen: Add AUTOUIC_SEARCH_PATHS release notes
36fa535d Autogen: Add AUTOUIC_SEARCH_PATHS documentation
6d7c02db Autogen: Add AUTOUIC_SEARCH_PATHS test
1cdf7c1b Autogen: Add AUTOUIC_SEARCH_PATHS support
110c1bf4 Autogen: Add subDirPrefix function
db431ecf Autogen: Merge FindInIncludeDirectories into FindIncludeFile
-----------------------------------------------------------------------
Summary of changes:
Help/manual/cmake-properties.7.rst | 1 +
Help/manual/cmake-qt.7.rst | 4 +-
Help/manual/cmake-variables.7.rst | 1 +
Help/prop_tgt/AUTOUIC.rst | 9 +-
Help/prop_tgt/AUTOUIC_OPTIONS.rst | 2 +-
Help/prop_tgt/AUTOUIC_SEARCH_PATHS.rst | 12 +
Help/release/dev/Autogen_uic_paths.rst | 10 +
Help/variable/CMAKE_AUTOUIC_SEARCH_PATHS.rst | 11 +
Modules/AutogenInfo.cmake.in | 3 +-
Source/cmQtAutoGeneratorInitializer.cxx | 15 +-
Source/cmQtAutoGenerators.cxx | 516 ++++++++++----------
Source/cmQtAutoGenerators.h | 18 +-
Source/cmTarget.cxx | 1 +
Tests/QtAutogen/CMakeLists.txt | 4 +
Tests/QtAutogen/uicInclude/CMakeLists.txt | 8 +
.../{skipSource/uigen1.ui => uicInclude/PageC.ui} | 4 +-
.../uigen1.ui => uicInclude/dirA/PageA.ui} | 4 +-
.../uigen1.ui => uicInclude/dirB/sub/PageB.ui} | 4 +-
Tests/QtAutogen/uicInclude/main.cpp | 10 +
Tests/QtAutogen/uicInclude/main.hpp | 6 +
20 files changed, 374 insertions(+), 269 deletions(-)
create mode 100644 Help/prop_tgt/AUTOUIC_SEARCH_PATHS.rst
create mode 100644 Help/release/dev/Autogen_uic_paths.rst
create mode 100644 Help/variable/CMAKE_AUTOUIC_SEARCH_PATHS.rst
create mode 100644 Tests/QtAutogen/uicInclude/CMakeLists.txt
copy Tests/QtAutogen/{skipSource/uigen1.ui => uicInclude/PageC.ui} (87%)
copy Tests/QtAutogen/{skipSource/uigen1.ui => uicInclude/dirA/PageA.ui} (87%)
copy Tests/QtAutogen/{skipSource/uigen1.ui => uicInclude/dirB/sub/PageB.ui} (87%)
create mode 100644 Tests/QtAutogen/uicInclude/main.cpp
create mode 100644 Tests/QtAutogen/uicInclude/main.hpp
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list