From fe450e775224ff50b54a26c6aed54bab96a82cb5 Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Mon, 2 Jun 2025 16:10:33 +0200 Subject: [PATCH] CMake: Fix capturing of x86intrin compile test output TEST_x86intrin_OUTPUT is not set anymore since we lazily evaluate compile tests after 605913f9d7a60461939c1a8fb8dac05054cade2d . Use the new qt_configure_add_report_entry COMPILE_TESTS_TO_SHOW_ON_ERROR option to dump the test values in case of an error. Amends 9e9099865a0881ac5bb6035237e0a0c86962c45f Pick-to: 6.8 Task-number: QTBUG-122596 Change-Id: I48d1c57145ad5d9418631025927581c4eb5ec93c Reviewed-by: Joerg Bornemann Reviewed-by: Thiago Macieira (cherry picked from commit 5220685a11afcc02ae92e7fdd17c9efc72975e83) Reviewed-by: Qt Cherry-pick Bot (cherry picked from commit 2ee633a17af572ec54265f922c342fc759ecac56) --- configure.cmake | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/configure.cmake b/configure.cmake index 59cef3c9b93..e3b3c9da057 100644 --- a/configure.cmake +++ b/configure.cmake @@ -1451,17 +1451,16 @@ https://github.com/llvm/llvm-project/issues/53520 ]=] ) else() - string(CONCAT error_message + string(CONCAT x86_intrin_error_message "x86 intrinsics support missing. Check your compiler settings.\n" - "If this is an error, report at https://bugreports.qt.io with your compiler ID and " - "version, and this output:\n" - "\n" - "${TEST_x86intrin_OUTPUT}" + "If this is a problem for you, report at https://bugreports.qt.io with your compiler ID and " + "version, and the TEST_x86intrin compile test output.\n" ) qt_configure_add_report_entry( TYPE ERROR CONDITION (NOT QT_FEATURE_x86intrin) - MESSAGE "${error_message}" + COMPILE_TESTS_TO_SHOW_ON_ERROR TEST_x86intrin + MESSAGE "${x86_intrin_error_message}" ) endif() endif()