diff options
| author | Brad King <brad.king@kitware.com> | 2020-08-11 12:50:54 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2020-08-11 12:51:02 (GMT) |
| commit | 121c3717eee5fd0270d74413b8507aeeeb604477 (patch) | |
| tree | 0602010555fa54a8e8f15bb0b826647f2b02fdb9 /Help | |
| parent | bb1b37ea3bbf3ad3b513ad8642ef514099699aac (diff) | |
| parent | 5b5be348119859fd83503e163b386603f3e20c6d (diff) | |
| download | CMake-121c3717eee5fd0270d74413b8507aeeeb604477.zip CMake-121c3717eee5fd0270d74413b8507aeeeb604477.tar.gz CMake-121c3717eee5fd0270d74413b8507aeeeb604477.tar.bz2 | |
Merge topic 'automoc-path-prefix-off'
5b5be34811 Help: Add 3.18.2 release note about AUTOMOC_PATH_PREFIX default change
db659e18bc Merge branch 'backport-3.17-automoc-path-prefix-off'
e503fbe38a Merge branch 'backport-3.16-automoc-path-prefix-off'
4c33b305a0 Autogen: Turn off moc path prefix generation by default
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5105
Diffstat (limited to 'Help')
| -rw-r--r-- | Help/prop_tgt/AUTOMOC_PATH_PREFIX.rst | 5 | ||||
| -rw-r--r-- | Help/release/3.18.rst | 8 | ||||
| -rw-r--r-- | Help/variable/CMAKE_AUTOMOC_PATH_PREFIX.rst | 2 |
3 files changed, 11 insertions, 4 deletions
diff --git a/Help/prop_tgt/AUTOMOC_PATH_PREFIX.rst b/Help/prop_tgt/AUTOMOC_PATH_PREFIX.rst index 4f85c16..836d953 100644 --- a/Help/prop_tgt/AUTOMOC_PATH_PREFIX.rst +++ b/Help/prop_tgt/AUTOMOC_PATH_PREFIX.rst @@ -15,7 +15,7 @@ the ``-p`` path prefix option. ``moc`` usually generates a relative include path in that case. :prop_tgt:`AUTOMOC_PATH_PREFIX` is initialized from the variable -:variable:`CMAKE_AUTOMOC_PATH_PREFIX`, which is ``ON`` by default. +:variable:`CMAKE_AUTOMOC_PATH_PREFIX`, which is ``OFF`` by default. See the :manual:`cmake-qt(7)` manual for more information on using CMake with Qt. @@ -26,8 +26,7 @@ Reproducible builds For reproducible builds it is recommended to keep headers that are ``moc`` compiled in one of the target :command:`include directories <target_include_directories>` and set -:prop_tgt:`AUTOMOC_PATH_PREFIX` to ``ON`` (which is the default). This ensures -that: +:prop_tgt:`AUTOMOC_PATH_PREFIX` to ``ON``. This ensures that: - ``moc`` output files are identical on different build setups, - ``moc`` output files will compile correctly when the source and/or diff --git a/Help/release/3.18.rst b/Help/release/3.18.rst index ba80d2b..93694f6 100644 --- a/Help/release/3.18.rst +++ b/Help/release/3.18.rst @@ -339,3 +339,11 @@ Changes made since CMake 3.18.0 include the following. that were using manual quoting or escaping to work around the prior limitation. This fix has been reverted in 3.18.1, but may be re-introduced in future versions of CMake with a policy for compatibility. + +3.18.2 +------ + +* The default value of :variable:`CMAKE_AUTOMOC_PATH_PREFIX` was changed to + ``OFF`` because this feature can break existing projects that have + identically named header files in different include directories. + This restores compatibility with behavior of CMake 3.15 and below. diff --git a/Help/variable/CMAKE_AUTOMOC_PATH_PREFIX.rst b/Help/variable/CMAKE_AUTOMOC_PATH_PREFIX.rst index 07a6cc8..42f48b4 100644 --- a/Help/variable/CMAKE_AUTOMOC_PATH_PREFIX.rst +++ b/Help/variable/CMAKE_AUTOMOC_PATH_PREFIX.rst @@ -10,4 +10,4 @@ This variable is used to initialize the :prop_tgt:`AUTOMOC_PATH_PREFIX` property on all the targets. See that target property for additional information. -The default value is ``ON``. +The default value is ``OFF``. |