diff options
| author | Brad King <brad.king@kitware.com> | 2020-02-28 16:14:25 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2020-02-28 16:14:33 (GMT) |
| commit | 15ac1f671ba8d77e8402c6b40ea2caf1d0f970b6 (patch) | |
| tree | cac2ef2cbb81e06a1143d8c4d7e038935fb94cb7 /Modules | |
| parent | 813b28902320831c0a668d1a6dc30817c87c73c3 (diff) | |
| parent | 426941c433039d4f5852a8a177b3047f87f5c822 (diff) | |
| download | CMake-15ac1f671ba8d77e8402c6b40ea2caf1d0f970b6.zip CMake-15ac1f671ba8d77e8402c6b40ea2caf1d0f970b6.tar.gz CMake-15ac1f671ba8d77e8402c6b40ea2caf1d0f970b6.tar.bz2 | |
Merge topic 'q_namespace_export' into release-3.17
426941c433 Autogen: Recognize the new Q_NAMESPACE_EXPORT macro in AUTOMOC
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4398
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/CMakeGenericSystem.cmake | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Modules/CMakeGenericSystem.cmake b/Modules/CMakeGenericSystem.cmake index 7efe5c4..f539b46 100644 --- a/Modules/CMakeGenericSystem.cmake +++ b/Modules/CMakeGenericSystem.cmake @@ -27,7 +27,7 @@ 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) -set(CMAKE_AUTOMOC_MACRO_NAMES "Q_OBJECT" "Q_GADGET" "Q_NAMESPACE") +set(CMAKE_AUTOMOC_MACRO_NAMES "Q_OBJECT" "Q_GADGET" "Q_NAMESPACE" "Q_NAMESPACE_EXPORT") # basically all general purpose OSs support shared libs set_property(GLOBAL PROPERTY TARGET_SUPPORTS_SHARED_LIBS TRUE) |