summaryrefslogtreecommitdiffstats
path: root/cmake
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@qt.io>2021-07-14 15:43:39 +0200
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2021-07-14 18:59:21 +0000
commit95a3c04441fdcec686e9a2bc102799aa8d2d05bf (patch)
treeb9186107be7d63a2c09a2607318ececbb0e2b8e4 /cmake
parent890d84a105d8b940e3f469bb1247c0e2c8b6c293 (diff)
Report multi-arch targets in the configure summary
Otherwise it will confusingly only list the host arch Change-Id: Ic6d080f1fd9ebfa260ce7c35bd5e5b4ee686f083 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> (cherry picked from commit f3e006a6985573a0b89772979fe7cb870576f4d7) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'cmake')
-rw-r--r--cmake/QtBuildInformation.cmake9
1 files 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: ")