From 2568988dab15402668351f69c9bf0067b53937f7 Mon Sep 17 00:00:00 2001 From: Cristian Adam Date: Fri, 23 Aug 2024 12:41:38 +0200 Subject: [PATCH] qtcreatorcdbext: Improve cross-compilation check It was failing on x64 since the values are x64 and AMD64 and were failing the check. Arm has both values ARM64. Change-Id: I404b85d9c499464797ece912ee5b83f93c21d04d Reviewed-by: David Schulz --- src/libs/qtcreatorcdbext/CMakeLists.txt | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/libs/qtcreatorcdbext/CMakeLists.txt b/src/libs/qtcreatorcdbext/CMakeLists.txt index bdda6a1f78f..b1d77c6c218 100644 --- a/src/libs/qtcreatorcdbext/CMakeLists.txt +++ b/src/libs/qtcreatorcdbext/CMakeLists.txt @@ -140,7 +140,14 @@ if (_library_enabled) endif() # Support for cross-compilation for arm64 on a x64 system - if (NOT MSVC_CXX_ARCHITECTURE_ID STREQUAL CMAKE_HOST_SYSTEM_PROCESSOR) + if (MSVC_CXX_ARCHITECTURE_ID STREQUAL "ARM64" AND CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL "ARM64") + set(arm64_on_arm64 ON) + endif() + if (MSVC_CXX_ARCHITECTURE_ID STREQUAL "x64" AND CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL "AMD64") + set(x64_on_x64 ON) + endif() + + if (NOT arm64_on_arm64 AND NOT x64_on_x64) find_program(dumpbin_executable dumpbin) find_program(lib_executable lib)