diff options
| author | Brad King <brad.king@kitware.com> | 2020-12-17 18:22:28 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2020-12-17 18:22:40 (GMT) |
| commit | 6d7621baeaaf4e19322480484b33f9ca95e6c75e (patch) | |
| tree | b2edc5d55d789617f7378ce2d6efe330845effe9 /Help | |
| parent | 215bd0e72b48b2fb2b8e62a53765a60064d7b4b0 (diff) | |
| parent | 20e4db4a6671ef2c39863d08fc5513848c1a07b6 (diff) | |
| download | CMake-6d7621baeaaf4e19322480484b33f9ca95e6c75e.zip CMake-6d7621baeaaf4e19322480484b33f9ca95e6c75e.tar.gz CMake-6d7621baeaaf4e19322480484b33f9ca95e6c75e.tar.bz2 | |
Merge topic 'qt-autogen-per-config'
20e4db4a66 cmGeneratorTarget: Make GetConfigCommonSourceFiles Xcode-specific
92d7b456e5 Autogen: Add support for per-config sources
3ffebbaefb Tests/QtAutogen: Forward build configuration in multi-config generators
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5624
Diffstat (limited to 'Help')
| -rw-r--r-- | Help/manual/cmake-qt.7.rst | 7 | ||||
| -rw-r--r-- | Help/prop_tgt/AUTOMOC.rst | 3 | ||||
| -rw-r--r-- | Help/release/dev/qt-autogen-per-config.rst | 4 |
3 files changed, 11 insertions, 3 deletions
diff --git a/Help/manual/cmake-qt.7.rst b/Help/manual/cmake-qt.7.rst index d8d6172..f156f95 100644 --- a/Help/manual/cmake-qt.7.rst +++ b/Help/manual/cmake-qt.7.rst @@ -48,6 +48,8 @@ and ``rcc`` for virtual file system content generation. These tools may be automatically invoked by :manual:`cmake(1)` if the appropriate conditions are met. The automatic tool invocation may be used with both Qt 4 and Qt 5. +.. _`Qt AUTOMOC`: + AUTOMOC ^^^^^^^ @@ -77,8 +79,9 @@ automatically added to the target's :prop_tgt:`INCLUDE_DIRECTORIES`. Not included ``moc_<basename>.cpp`` files will be generated in custom folders to avoid name collisions and included in a separate -``<AUTOGEN_BUILD_DIR>/mocs_compilation.cpp`` file which is compiled -into the target. +file which is compiled into the target, named either +``<AUTOGEN_BUILD_DIR>/mocs_compilation.cpp`` or +``<AUTOGEN_BUILD_DIR>/mocs_compilation_$<CONFIG>.cpp``. * See :prop_tgt:`AUTOGEN_BUILD_DIR`. diff --git a/Help/prop_tgt/AUTOMOC.rst b/Help/prop_tgt/AUTOMOC.rst index c18859b..52d96e0 100644 --- a/Help/prop_tgt/AUTOMOC.rst +++ b/Help/prop_tgt/AUTOMOC.rst @@ -137,7 +137,8 @@ parent directory path of the ``moc`` input file. This scheme allows to have All not included ``moc`` output files will be included automatically by the CMake generated file -- ``<AUTOGEN_BUILD_DIR>/mocs_compilation.cpp``, +- ``<AUTOGEN_BUILD_DIR>/mocs_compilation.cpp``, or +- ``<AUTOGEN_BUILD_DIR>/mocs_compilation_$<CONFIG>.cpp``, which is added to the target's sources. diff --git a/Help/release/dev/qt-autogen-per-config.rst b/Help/release/dev/qt-autogen-per-config.rst new file mode 100644 index 0000000..6ba929d --- /dev/null +++ b/Help/release/dev/qt-autogen-per-config.rst @@ -0,0 +1,4 @@ +qt-autogen-per-config +--------------------- + +* The :ref:`Qt AUTOMOC` feature now works with per-config sources. |