diff options
| author | Brad King <brad.king@kitware.com> | 2022-11-17 13:13:25 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2022-11-17 13:13:40 (GMT) |
| commit | d3b361c43b09f95263e5077eb375e0fa4da14bcf (patch) | |
| tree | e44144ad0fc5f3b365c5cdef116d82652e890837 | |
| parent | d183038b68330ac115ee996006049bf1fba7ffc1 (diff) | |
| parent | 70c721befb52c2b4b718656a80df00f50dc689c7 (diff) | |
| download | CMake-d3b361c43b09f95263e5077eb375e0fa4da14bcf.zip CMake-d3b361c43b09f95263e5077eb375e0fa4da14bcf.tar.gz CMake-d3b361c43b09f95263e5077eb375e0fa4da14bcf.tar.bz2 | |
Merge topic 'automoc-var-init'
70c721befb AutoMoc: Don't initialize already defined CMAKE_AUTOMOC_ variables
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !7922
| -rw-r--r-- | Modules/CMakeGenericSystem.cmake | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/Modules/CMakeGenericSystem.cmake b/Modules/CMakeGenericSystem.cmake index e2925dc..77c1780 100644 --- a/Modules/CMakeGenericSystem.cmake +++ b/Modules/CMakeGenericSystem.cmake @@ -30,12 +30,18 @@ set(CMAKE_FIND_LIBRARY_SUFFIXES ".so" ".a") # LINK_LIBRARY_OVERRIDE_<LIBRARY> target properties set(CMAKE_LINK_LIBRARY_USING_DEFAULT_SUPPORTED TRUE) -set(CMAKE_AUTOGEN_ORIGIN_DEPENDS ON) -set(CMAKE_AUTOMOC_COMPILER_PREDEFINES ON) +if(NOT DEFINED CMAKE_AUTOGEN_ORIGIN_DEPENDS) + set(CMAKE_AUTOGEN_ORIGIN_DEPENDS ON) +endif() +if(NOT DEFINED CMAKE_AUTOMOC_COMPILER_PREDEFINES) + set(CMAKE_AUTOMOC_COMPILER_PREDEFINES ON) +endif() 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") +if(NOT DEFINED CMAKE_AUTOMOC_MACRO_NAMES) + set(CMAKE_AUTOMOC_MACRO_NAMES "Q_OBJECT" "Q_GADGET" "Q_NAMESPACE" "Q_NAMESPACE_EXPORT") +endif() # basically all general purpose OSs support shared libs set_property(GLOBAL PROPERTY TARGET_SUPPORTS_SHARED_LIBS TRUE) |