From 7d801ad245d4af537a9bbde5624aad8513fc8b43 Mon Sep 17 00:00:00 2001 From: Remek Zajac Date: Mon, 26 Sep 2022 18:36:16 +0200 Subject: [PATCH] Addressing review comments: s/arm64/arm64-v8a https://github.com/airmap/platform-sdk/issues/182#issuecomment-1258188025 qmake on aarch64 linux says: 'arm64' and not 'arm64-v8a' like Android does. --- QGCExternalLibs.pri | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/QGCExternalLibs.pri b/QGCExternalLibs.pri index 742ba26..a12d22c 100644 --- a/QGCExternalLibs.pri +++ b/QGCExternalLibs.pri @@ -298,13 +298,13 @@ contains (DEFINES, DISABLE_AIRMAP) { } } else:LinuxBuild { AIRMAP_PLATFORM_SDK_ARCH = "" - contains (QT_ARCH, arm64-v8a) { + contains (QT_ARCH, arm64) { AIRMAP_PLATFORM_SDK_ARCH = "aarch64" } else:contains (QT_ARCH, x86_64) { AIRMAP_PLATFORM_SDK_ARCH = "x86_64" } isEmpty( AIRMAP_PLATFORM_SDK_ARCH ) { - message("Skipping support for Airmap (unsupported architecture)") + message($$sprintf("Skipping support for Airmap (unsupported architecture: '%1')", $$QT_ARCH)) } else { #-- Download and install platform-sdk libs and headers iff they're not already in the build directory AIRMAP_PLATFORM_SDK_URL = "https://github.com/airmap/platform-sdk/releases/download/2.0.1/airmap-platform-sdk-2.0.1-Linux-$${AIRMAP_PLATFORM_SDK_ARCH}.deb"