diff options
| -rw-r--r-- | cmake/QtModuleHelpers.cmake | 14 | ||||
| -rw-r--r-- | src/corelib/Qt6CoreConfigExtras.cmake.in | 2 |
2 files changed, 16 insertions, 0 deletions
diff --git a/cmake/QtModuleHelpers.cmake b/cmake/QtModuleHelpers.cmake index dfafa7eec9..97a25fa38e 100644 --- a/cmake/QtModuleHelpers.cmake +++ b/cmake/QtModuleHelpers.cmake @@ -427,6 +427,20 @@ function(qt_internal_add_module target) list(APPEND extra_cmake_includes "${INSTALL_CMAKE_NAMESPACE}${target}Macros.cmake") endif() if (EXISTS "${CMAKE_CURRENT_LIST_DIR}/${INSTALL_CMAKE_NAMESPACE}${target}ConfigExtras.cmake.in") + if(target STREQUAL Core) + set(extra_cmake_code "") + # Add some variables for compatibility with Qt5 config files. + if(QT_FEATURE_reduce_exports) + string(APPEND qtcore_extra_cmake_code " +set(QT_VISIBILITY_AVAILABLE TRUE)") + endif() + if(QT_LIBINFIX) + string(APPEND qtcore_extra_cmake_code " +set(QT_LIBINFIX \"${QT_LIBINFIX}\")") + endif() + + endif() + configure_file("${CMAKE_CURRENT_LIST_DIR}/${INSTALL_CMAKE_NAMESPACE}${target}ConfigExtras.cmake.in" "${config_build_dir}/${INSTALL_CMAKE_NAMESPACE}${target}ConfigExtras.cmake" @ONLY) diff --git a/src/corelib/Qt6CoreConfigExtras.cmake.in b/src/corelib/Qt6CoreConfigExtras.cmake.in index 6e56a20b29..b7c30d52be 100644 --- a/src/corelib/Qt6CoreConfigExtras.cmake.in +++ b/src/corelib/Qt6CoreConfigExtras.cmake.in @@ -49,6 +49,8 @@ set(_Qt6CTestMacros "${_Qt6CoreConfigDir}/Qt6CTestMacros.cmake") _qt_internal_setup_startup_target() +@qtcore_extra_cmake_code@ + if(ANDROID_PLATFORM) include("${CMAKE_CURRENT_LIST_DIR}/@QT_CMAKE_EXPORT_NAMESPACE@AndroidMacros.cmake") endif() |