CMake: Fix missing output of TEST_x86intrin_OUTPUT config test
When the intrinsics test failed, we never showed the failing build output due to two reasons: - TEST_x86intrin_OUTPUT was empty - bracket arguments don't do variable expansion Use the newly introduced feature in qt_config_compile_test to get the output. Replace the usage of a bracket argument with a concatenation of regular strings. Amends db342f42a4b00f858cb43328c9fdaff5fe2b5788 Task-number: QTBUG-122596 Change-Id: I7cdef9a145ac64c8fced8add4879fa19b8bcd19d Reviewed-by: Alexey Edelev <alexey.edelev@qt.io> (cherry picked from commit 9e9099865a0881ac5bb6035237e0a0c86962c45f) Reviewed-by: Alexey Edelev <alexey.edelev@qt.io> (cherry picked from commit fd8696e943176f293a1f90d2370702398b0d582c) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> (cherry picked from commit eafad1665a4e93e98f0c484ac90e42d5a69c52e6)
This commit is contained in:
parent
dd200f61fb
commit
2880f8b2f6
@ -1315,16 +1315,17 @@ the result of the build in config.tests/x86intrin and report at https://bugrepor
|
||||
]=]
|
||||
)
|
||||
else()
|
||||
string(CONCAT 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}"
|
||||
)
|
||||
qt_configure_add_report_entry(
|
||||
TYPE ERROR
|
||||
CONDITION (NOT QT_FEATURE_x86intrin)
|
||||
MESSAGE [========[
|
||||
x86 intrinsics support missing. Check your compiler settings. If this is an
|
||||
error, report at https://bugreports.qt.io with your compiler ID and version,
|
||||
and this output:
|
||||
|
||||
${TEST_x86intrin_OUTPUT}
|
||||
]========]
|
||||
MESSAGE "${error_message}"
|
||||
)
|
||||
endif()
|
||||
endif()
|
||||
|
Loading…
x
Reference in New Issue
Block a user