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:01 (GMT) |
| commit | e524819483cc896745682769c781099c214149bc (patch) | |
| tree | 407bd7e2a7c68c86b42ce8dff42d4f37ad5b2c4e /Modules | |
| parent | b8214a87bf3962029a3d35863ec0187f7c1819d7 (diff) | |
| parent | 5b5be348119859fd83503e163b386603f3e20c6d (diff) | |
| download | CMake-e524819483cc896745682769c781099c214149bc.zip CMake-e524819483cc896745682769c781099c214149bc.tar.gz CMake-e524819483cc896745682769c781099c214149bc.tar.bz2 | |
Merge topic 'automoc-path-prefix-off' into release-3.18
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
56510b7d85 Merge branch 'backport-test-FindPkgConfig-isolate-env' into release-3.17
effc9a1032 Merge branch 'backport-3.17-automoc_timestamp_deps' into release-3.17
507fecd7e2 Merge branch 'ninja-multi-rsp-remove-path' into release-3.17
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5105
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/CMakeGenericSystem.cmake | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/Modules/CMakeGenericSystem.cmake b/Modules/CMakeGenericSystem.cmake index 000fba1..6f665a6 100644 --- a/Modules/CMakeGenericSystem.cmake +++ b/Modules/CMakeGenericSystem.cmake @@ -26,7 +26,9 @@ set(CMAKE_FIND_LIBRARY_SUFFIXES ".so" ".a") set(CMAKE_AUTOGEN_ORIGIN_DEPENDS ON) set(CMAKE_AUTOMOC_COMPILER_PREDEFINES ON) -set(CMAKE_AUTOMOC_PATH_PREFIX ON) +if(NOT DEFINED CMAKE_AUTOMOC_PATH_PREFIX) + set(CMAKE_AUTOMOC_PATH_PREFIX OFF) +endif() set(CMAKE_AUTOMOC_MACRO_NAMES "Q_OBJECT" "Q_GADGET" "Q_NAMESPACE" "Q_NAMESPACE_EXPORT") # basically all general purpose OSs support shared libs |