diff options
Diffstat (limited to 'src/corelib/Qt6CoreConfigExtras.cmake.in')
| -rw-r--r-- | src/corelib/Qt6CoreConfigExtras.cmake.in | 20 |
1 files changed, 4 insertions, 16 deletions
diff --git a/src/corelib/Qt6CoreConfigExtras.cmake.in b/src/corelib/Qt6CoreConfigExtras.cmake.in index 4a9f72a049..7fd929e59b 100644 --- a/src/corelib/Qt6CoreConfigExtras.cmake.in +++ b/src/corelib/Qt6CoreConfigExtras.cmake.in @@ -2,16 +2,6 @@ if(NOT DEFINED QT_DEFAULT_MAJOR_VERSION) set(QT_DEFAULT_MAJOR_VERSION 6) endif() -# include(\"${CMAKE_CURRENT_LIST_DIR}/Qt5CoreConfigExtrasMkspecDir.cmake\") -# -# foreach(_dir ${_qt5_corelib_extra_includes}) -# _qt5_Core_check_file_exists(${_dir}) -# endforeach() - -# list(APPEND Qt5Core_INCLUDE_DIRS ${_qt5_corelib_extra_includes}) -# set_property(TARGET @QT_CMAKE_EXPORT_NAMESPACE@::Core APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES ${_qt5_corelib_extra_includes}) -# set(_qt5_corelib_extra_includes) - if (NOT QT_NO_CREATE_TARGETS) set(__qt_core_target @QT_CMAKE_EXPORT_NAMESPACE@::Core) get_property(__qt_core_aliased_target TARGET ${__qt_core_target} PROPERTY ALIASED_TARGET) @@ -19,19 +9,17 @@ if (NOT QT_NO_CREATE_TARGETS) set(__qt_core_target "${__qt_core_aliased_target}") endif() unset(__qt_core_aliased_target) - if (NOT "@QT_NAMESPACE@" STREQUAL "") - set_property(TARGET ${__qt_core_target} APPEND PROPERTY INTERFACE_COMPILE_DEFINITIONS QT_NAMESPACE=@QT_NAMESPACE@) - endif() + @qtcore_namespace_definition@ set_property(TARGET ${__qt_core_target} APPEND PROPERTY INTERFACE_COMPILE_DEFINITIONS $<$<NOT:$<CONFIG:Debug>>:QT_NO_DEBUG>) set_property(TARGET ${__qt_core_target} PROPERTY INTERFACE_COMPILE_FEATURES cxx_decltype) endif() -list(APPEND CMAKE_AUTOMOC_MACRO_NAMES Q_OBJECT Q_GADGET Q_GADGET_EXPORT Q_NAMESPACE Q_NAMESPACE_EXPORT) +# note: all the other AUTOMOC_MACRO_NAMES are already set by upstream CMake +list(APPEND CMAKE_AUTOMOC_MACRO_NAMES Q_GADGET_EXPORT Q_ENUM_NS) list(REMOVE_DUPLICATES CMAKE_AUTOMOC_MACRO_NAMES) -include("${CMAKE_CURRENT_LIST_DIR}/QtInstallPaths.cmake") - set(QT@PROJECT_VERSION_MAJOR@_IS_SHARED_LIBS_BUILD "@BUILD_SHARED_LIBS@") +set(QT@PROJECT_VERSION_MAJOR@_DEBUG_POSTFIX "@CMAKE_DEBUG_POSTFIX@") set(_Qt6CTestMacros "${CMAKE_CURRENT_LIST_DIR}/Qt6CTestMacros.cmake") |