From 409bfca8904dbdd6b29eb1537bca86e69f576b69 Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Tue, 23 Apr 2024 12:54:24 -0700 Subject: [PATCH] CMake: fix cross-compilation build: ${CMAKE_SYSTEM_PROCESSOR} is empty CMake Error at tests/auto/corelib/global/qcomparehelpers/CMakeLists.txt: 20 (if): if given arguments: "CMAKE_VERSION" "VERSION_GREATER_EQUAL" "3.20" "AND" "NOT" "MACOS" "AND" "NOT" "VXWORKS" "AND" "NOT" "(" "LINUX" "AND" "MATCHES" "aarch64" ")" Unknown arguments specified Change-Id: I6979d02a7395405cbf23fffd17c900d8e25e4c0c Reviewed-by: Ivan Solovev (cherry picked from commit 1d17604c65803f900c751bd6386fc243c0291f06) Reviewed-by: Qt Cherry-pick Bot --- tests/auto/corelib/global/qcomparehelpers/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/auto/corelib/global/qcomparehelpers/CMakeLists.txt b/tests/auto/corelib/global/qcomparehelpers/CMakeLists.txt index 4cbfd97c695..d3593c7b527 100644 --- a/tests/auto/corelib/global/qcomparehelpers/CMakeLists.txt +++ b/tests/auto/corelib/global/qcomparehelpers/CMakeLists.txt @@ -17,7 +17,7 @@ qt_internal_add_test(tst_qcomparehelpers # CMake recognizes CXX_STANDARD=23 only starting from version 3.20 # macOS has some issues with concepts, see QTBUG-117765 -if (CMAKE_VERSION VERSION_GREATER_EQUAL "3.20" AND NOT MACOS AND NOT VXWORKS AND NOT (LINUX AND ${CMAKE_SYSTEM_PROCESSOR} MATCHES "aarch64")) +if (CMAKE_VERSION VERSION_GREATER_EQUAL "3.20" AND NOT MACOS AND NOT VXWORKS AND NOT (LINUX AND "${CMAKE_SYSTEM_PROCESSOR}" MATCHES "aarch64")) qt_internal_add_test(tst_qcomparehelpers_cpp23 SOURCES tst_qcomparehelpers.h tst_qcomparehelpers.cpp