From d13ebbdcab6f5c84e0022077106808bf9b4c5b68 Mon Sep 17 00:00:00 2001 From: Cristian Adam Date: Wed, 18 Sep 2024 12:00:15 +0200 Subject: [PATCH] Auto-Setup: Fix VCPKG_TARGET_TRIPLET detection on Arm64 macOS This way one could build vpkg applications by default without having linking errors. Change-Id: I8772760399a9b655ceeb389ea3c7a26e6c756e0f Reviewed-by: Marcus Tillmanns --- src/share/3rdparty/package-manager/auto-setup.cmake | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/src/share/3rdparty/package-manager/auto-setup.cmake b/src/share/3rdparty/package-manager/auto-setup.cmake index ae0a35e60c9..129c69fe4d3 100644 --- a/src/share/3rdparty/package-manager/auto-setup.cmake +++ b/src/share/3rdparty/package-manager/auto-setup.cmake @@ -250,7 +250,16 @@ macro(qtc_auto_setup_vcpkg) set(vcpkg_triplet ${CMAKE_MATCH_1}-windows) endif() elseif(APPLE) - set(vcpkg_triplet x64-osx) + # We're too early to use CMAKE_HOST_SYSTEM_PROCESSOR + execute_process( + COMMAND uname -m + OUTPUT_VARIABLE __apple_host_system_processor + OUTPUT_STRIP_TRAILING_WHITESPACE) + if (__apple_host_system_processor MATCHES "arm64") + set(vcpkg_triplet arm64-osx) + else() + set(vcpkg_triplet x64-osx) + endif() else() set(vcpkg_triplet x64-linux) endif()