diff options
| author | Brad King <brad.king@kitware.com> | 2020-08-10 16:21:30 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2020-08-10 16:21:30 (GMT) |
| commit | 09507da00a346289e1d9e257cceb2b2681ecd85b (patch) | |
| tree | 32e3b29d6322061f5dbc4eabc1aec6ae3ab53438 /Modules | |
| parent | 56510b7d852c73c581a3bac1ed491188b4da9c4c (diff) | |
| parent | e503fbe38ae8284c0ed027401c177f723283f0d8 (diff) | |
| download | CMake-09507da00a346289e1d9e257cceb2b2681ecd85b.zip CMake-09507da00a346289e1d9e257cceb2b2681ecd85b.tar.gz CMake-09507da00a346289e1d9e257cceb2b2681ecd85b.tar.bz2 | |
Merge branch 'backport-3.17-automoc-path-prefix-off' into release-3.17
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 f539b46..a773dcd 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 |
