summaryrefslogtreecommitdiffstats
path: root/configure.cmake
diff options
context:
space:
mode:
authorAmir Masoud Abdol <amir.abdol@qt.io>2023-06-12 14:42:20 +0200
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2023-06-23 07:53:30 +0000
commitd0262b4f9547e3c4aaccb706782908d566dde1bf (patch)
treeaa882c6206f0eb22e9d028a0e26236b891f78362 /configure.cmake
parent6db8d0677862b1796fc9ee1e60d9a06d95ee2524 (diff)
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`. Fixes: QTBUG-108015 Change-Id: I49e79177ca833007b932b58a76261c07acd52ca6 Reviewed-by: Alexey Edelev <alexey.edelev@qt.io> (cherry picked from commit 059f4dc6f85525a07d0985ee90f845bd6208693b) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'configure.cmake')
-rw-r--r--configure.cmake12
1 files changed, 7 insertions, 5 deletions
diff --git a/configure.cmake b/configure.cmake
index d334a9bbdd..69c70c9a53 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