From 28ed9e3e2d8f3be46d0498e06b7d9664f32dcfb8 Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Wed, 7 Oct 2020 16:32:46 +0200 Subject: CMake: Set some additional info variables in Qt6CoreConfigExtras Add info whether Qt was an infix built, and whether the reduce_exports feature was enabled. These variable were set before in Qt5CoreConfigExtras.cmake. Change-Id: Id077763cfffd5ee6f1a7a28d04cf92dc46390c54 Reviewed-by: Qt CI Bot Reviewed-by: Cristian Adam --- cmake/QtModuleHelpers.cmake | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'cmake/QtModuleHelpers.cmake') 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) -- cgit v1.2.3