From 88c7f0250ae26270116a7a54ed86860856d99ca8 Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Mon, 2 Jun 2025 16:12:23 +0200 Subject: [PATCH] CMake: Improve atmoicfptr error message on failure Remove the obsolete reference to the atomicfptr directory in the error message. With the improved error reporting of the parent change, the build system will now dump the output of the atomicfptr test in case of failure, which should provide more information about what goes wrong. Pick-to: 6.9 6.8 Fixes: QTBUG-133687 Change-Id: Iaffc992f90c06425113cc2ef721d87d31e97bbc6 Reviewed-by: Thiago Macieira (cherry picked from commit 86d843be47d04ca2d5c2ab1f052cd2a822a2979c) Reviewed-by: Qt Cherry-pick Bot --- src/corelib/configure.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/corelib/configure.cmake b/src/corelib/configure.cmake index 8902194ed5d..0915899656f 100644 --- a/src/corelib/configure.cmake +++ b/src/corelib/configure.cmake @@ -1262,7 +1262,7 @@ qt_configure_add_report_entry( ) qt_configure_add_report_entry( TYPE ERROR - MESSAGE "detected a std::atomic implementation that fails for function pointers. Please apply the patch corresponding to your Standard Library vendor, found in qtbase/config.tests/atomicfptr" + MESSAGE "detected a std::atomic implementation that fails for function pointers." CONDITION NOT TEST_atomicfptr ) qt_configure_add_report_entry(