From f3e006a6985573a0b89772979fe7cb870576f4d7 Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Wed, 14 Jul 2021 15:43:39 +0200 Subject: [PATCH] Report multi-arch targets in the configure summary Otherwise it will confusingly only list the host arch Pick-to: 6.2 Change-Id: Ic6d080f1fd9ebfa260ce7c35bd5e5b4ee686f083 Reviewed-by: Alexandru Croitor --- cmake/QtBuildInformation.cmake | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/cmake/QtBuildInformation.cmake b/cmake/QtBuildInformation.cmake index c010ff631d..6828cbba8e 100644 --- a/cmake/QtBuildInformation.cmake +++ b/cmake/QtBuildInformation.cmake @@ -272,8 +272,13 @@ endfunction() function(qt_configure_process_add_summary_build_type_and_config) get_property(subarch_summary GLOBAL PROPERTY qt_configure_subarch_summary) - set(message - "Building for: ${QT_QMAKE_TARGET_MKSPEC} (${TEST_architecture_arch}, CPU features: ${subarch_summary})") + if(APPLE AND (CMAKE_OSX_ARCHITECTURES MATCHES ";")) + set(message + "Building for: ${QT_QMAKE_TARGET_MKSPEC} (${CMAKE_OSX_ARCHITECTURES}), ${TEST_architecture_arch} features: ${subarch_summary})") + else() + set(message + "Building for: ${QT_QMAKE_TARGET_MKSPEC} (${TEST_architecture_arch}, CPU features: ${subarch_summary})") + endif() qt_configure_add_report("${message}") set(message "Compiler: ")