zhaohuwei
/
QG4
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

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.
QGC4.4
Remek Zajac 2 years ago committed by Patrick José Pereira
parent
aa0bb2db3a
commit
7d801ad245
1 changed files with 2 additions and 2 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      QGCExternalLibs.pri

4
QGCExternalLibs.pri
Unescape View File

@ -298,13 +298,13 @@ contains (DEFINES, DISABLE_AIRMAP) {
} }
} else:LinuxBuild { } else:LinuxBuild {
AIRMAP_PLATFORM_SDK_ARCH = "" AIRMAP_PLATFORM_SDK_ARCH = ""
contains (QT_ARCH, arm64-v8a) { contains (QT_ARCH, arm64) {
AIRMAP_PLATFORM_SDK_ARCH = "aarch64" AIRMAP_PLATFORM_SDK_ARCH = "aarch64"
} else:contains (QT_ARCH, x86_64) { } else:contains (QT_ARCH, x86_64) {
AIRMAP_PLATFORM_SDK_ARCH = "x86_64" AIRMAP_PLATFORM_SDK_ARCH = "x86_64"
} }
isEmpty( AIRMAP_PLATFORM_SDK_ARCH ) { isEmpty( AIRMAP_PLATFORM_SDK_ARCH ) {
message("Skipping support for Airmap (unsupported architecture)") message($$sprintf("Skipping support for Airmap (unsupported architecture: '%1')", $$QT_ARCH))
} else { } else {
#-- Download and install platform-sdk libs and headers iff they're not already in the build directory #-- 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" 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"

Write Preview
Loading…
Cancel
Save