From 059f4dc6f85525a07d0985ee90f845bd6208693b Mon Sep 17 00:00:00 2001 From: Amir Masoud Abdol Date: Mon, 12 Jun 2023 14:42:20 +0200 Subject: [PATCH] Disable TEST_separate_debug_info when building with MSVC or on Apple As mentioned, separate debug info will always be generated when building with `-release -force-debug-info`. Pick-to: 6.5 6.6 Fixes: QTBUG-108015 Change-Id: I49e79177ca833007b932b58a76261c07acd52ca6 Reviewed-by: Alexey Edelev --- configure.cmake | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/configure.cmake b/configure.cmake index 361b37a331c..e8eb79c6855 100644 --- a/configure.cmake +++ b/configure.cmake @@ -285,11 +285,13 @@ int main(void) "# FIXME: qmake: ['TEMPLATE = lib', 'CONFIG += dll bsymbolic_functions', 'isEmpty(QMAKE_LFLAGS_BSYMBOLIC_FUNC): error("Nope")'] ) +if(NOT MSVC AND NOT APPLE) + qt_config_compile_test("separate_debug_info" + LABEL "separate debug information support" + PROJECT_PATH "${CMAKE_CURRENT_SOURCE_DIR}/config.tests/separate_debug_info" + ) +endif() -qt_config_compile_test("separate_debug_info" - LABEL "separate debug information support" - PROJECT_PATH "${CMAKE_CURRENT_SOURCE_DIR}/config.tests/separate_debug_info" -) # signaling_nan qt_config_compile_test(signaling_nan LABEL "Signaling NaN for doubles" @@ -519,7 +521,7 @@ qt_feature_config("force_debug_info" QMAKE_PRIVATE_CONFIG) qt_feature("separate_debug_info" PUBLIC LABEL "Split off debug information" AUTODETECT OFF - CONDITION ( QT_FEATURE_shared ) AND ( QT_FEATURE_debug OR QT_FEATURE_debug_and_release OR QT_FEATURE_force_debug_info ) AND ( APPLE OR TEST_separate_debug_info ) + CONDITION ( QT_FEATURE_shared ) AND ( QT_FEATURE_debug OR QT_FEATURE_debug_and_release OR QT_FEATURE_force_debug_info ) AND ( MSVC OR APPLE OR TEST_separate_debug_info ) ) qt_feature_config("separate_debug_info" QMAKE_PUBLIC_QT_CONFIG) qt_feature("appstore-compliant" PUBLIC