1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

CMake: Fix capturing of x86intrin compile test output

Browse Source 
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 6.9 6.10
Task-number: QTBUG-122596
Change-Id: I48d1c57145ad5d9418631025927581c4eb5ec93c
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
This commit is contained in:
Alexandru Croitor 2025-06-02 16:10:33 +02:00
parent a20a40095a
commit 5220685a11
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
configure.cmake
View File

@ -1441,17 +1441,16 @@ https://github.com/llvm/llvm-project/issues/53520
]=] ]=]
) )
else() else()
string(CONCAT error_message string(CONCAT x86_intrin_error_message
"x86 intrinsics support missing. Check your compiler settings.\n" "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 " "If this is a problem for you, report at https://bugreports.qt.io with your compiler ID and "
"version, and this output:\n" "version, and the TEST_x86intrin compile test output.\n"
"\n"
"${TEST_x86intrin_OUTPUT}"
) )
qt_configure_add_report_entry( qt_configure_add_report_entry(
TYPE ERROR TYPE ERROR
CONDITION (NOT QT_FEATURE_x86intrin) CONDITION (NOT QT_FEATURE_x86intrin)
MESSAGE "${error_message}" COMPILE_TESTS_TO_SHOW_ON_ERROR TEST_x86intrin
MESSAGE "${x86_intrin_error_message}"
) )
endif() endif()
endif() endif()