diff options
| author | Brad King <brad.king@kitware.com> | 2017-10-06 11:21:07 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2017-10-06 11:21:07 (GMT) |
| commit | bd9451231cedef1ebf0e55706a9abb68f53b3a8e (patch) | |
| tree | 066e4bb990ba51a2ab6143d721ac608ffba0398b | |
| parent | 7a31da43b1b598a255bf5261f7dff66e5aa71dd0 (diff) | |
| parent | 3cebe2aba8dde2a2cafb85097adf48dff84758de (diff) | |
| download | CMake-bd9451231cedef1ebf0e55706a9abb68f53b3a8e.zip CMake-bd9451231cedef1ebf0e55706a9abb68f53b3a8e.tar.gz CMake-bd9451231cedef1ebf0e55706a9abb68f53b3a8e.tar.bz2 | |
Merge branch 'revise-3.10-relnotes' into release-3.10
Merge-request: !1357
| -rw-r--r-- | Help/release/3.10.rst | 29 |
1 files changed, 10 insertions, 19 deletions
diff --git a/Help/release/3.10.rst b/Help/release/3.10.rst index 2e32401..35fe602 100644 --- a/Help/release/3.10.rst +++ b/Help/release/3.10.rst @@ -161,25 +161,16 @@ Autogen * When using :prop_tgt:`AUTOMOC`, CMake searches for the strings ``Q_OBJECT``, ``Q_GADGET`` or ``Q_NAMESPACE`` in a source file to determine if it needs - to be ``moc`` processed. The new variable - :variable:`CMAKE_AUTOMOC_MACRO_NAMES` allows to register additional - strings (macro names) so search for. - -* When using :prop_tgt:`AUTOMOC`, CMake searches for the strings ``Q_OBJECT``, - ``Q_GADGET`` or ``Q_NAMESPACE`` in a source file to determine if it needs - to be ``moc`` processed. The new target property - :prop_tgt:`AUTOMOC_MACRO_NAMES` allows to register additional strings - (macro names) so search for. - -* When using :prop_tgt:`AUTOMOC`, the new variable - :variable:`CMAKE_AUTOMOC_COMPILER_PREDEFINES` allows to default - enable or disable the generation of the compiler pre definitions file + to be ``moc`` processed. The new :variable:`CMAKE_AUTOMOC_MACRO_NAMES` + variable and :prop_tgt:`AUTOMOC_MACRO_NAMES` target property may be set + to register additional strings (macro names) to search for. + +* When using :prop_tgt:`AUTOMOC`, the new + :variable:`CMAKE_AUTOMOC_COMPILER_PREDEFINES` variable and + :prop_tgt:`AUTOMOC_COMPILER_PREDEFINES` target property specify whether + to enable or disable the generation of the compiler pre definitions file ``moc_predefs.h``. -* When using :prop_tgt:`AUTOMOC`, the new boolean target property - :prop_tgt:`AUTOMOC_COMPILER_PREDEFINES` allows to enable or disable the - generation of the compiler pre definitions file ``moc_predefs.h``. - CTest ----- @@ -218,8 +209,8 @@ CPack * The :module:`CPackIFW` module gained new :variable:`CPACK_IFW_REPOSITORIES_DIRECTORIES` variable to specify additional repositories dirs that will be used to resolve and - repack dependent components. This feature available only - since QtIFW 3.1. + repack dependent components. This feature is only available when + using QtIFW 3.1 or later. * Modules :module:`CPackRPM` and :module:`CPackDeb` learned to set package epoch version. |