diff options
| author | Brad King <brad.king@kitware.com> | 2020-08-10 14:49:18 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2020-08-10 14:49:18 (GMT) |
| commit | db659e18bc8d5869e28c315eb0ce5a6fd8ccf151 (patch) | |
| tree | 1da0c38e30880d69c89e63fdad4db3da74c1116a /Help | |
| parent | 72409ee089ee1c969bb11d36da9543a58b354321 (diff) | |
| parent | e503fbe38ae8284c0ed027401c177f723283f0d8 (diff) | |
| download | CMake-db659e18bc8d5869e28c315eb0ce5a6fd8ccf151.zip CMake-db659e18bc8d5869e28c315eb0ce5a6fd8ccf151.tar.gz CMake-db659e18bc8d5869e28c315eb0ce5a6fd8ccf151.tar.bz2 | |
Merge branch 'backport-3.17-automoc-path-prefix-off'
Diffstat (limited to 'Help')
| -rw-r--r-- | Help/prop_tgt/AUTOMOC_PATH_PREFIX.rst | 5 | ||||
| -rw-r--r-- | Help/variable/CMAKE_AUTOMOC_PATH_PREFIX.rst | 2 |
2 files changed, 3 insertions, 4 deletions
diff --git a/Help/prop_tgt/AUTOMOC_PATH_PREFIX.rst b/Help/prop_tgt/AUTOMOC_PATH_PREFIX.rst index 3e3059d..5ed504f 100644 --- a/Help/prop_tgt/AUTOMOC_PATH_PREFIX.rst +++ b/Help/prop_tgt/AUTOMOC_PATH_PREFIX.rst @@ -13,7 +13,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. @@ -24,8 +24,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/variable/CMAKE_AUTOMOC_PATH_PREFIX.rst b/Help/variable/CMAKE_AUTOMOC_PATH_PREFIX.rst index dca0b06..1e9790f 100644 --- a/Help/variable/CMAKE_AUTOMOC_PATH_PREFIX.rst +++ b/Help/variable/CMAKE_AUTOMOC_PATH_PREFIX.rst @@ -8,4 +8,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``. |