QuasarApp/qt-android-cmake
4
0
Fork 0
mirror of https://github.com/QuasarApp/qt-android-cmake.git synced 2025-04-26 13:44:35 +00:00
Code Issues Projects Releases Wiki Activity

Use env var ANDROID_SDK or ANDROID_SDK_ROOT

Browse Source 
Hello,
I have noticed on two platforms (linux and mac) that your project asks for an environment variable ANDROID_SDK.
However, after having installed "Android Studio + QtCreator + Android Sdk" on both platform, I noticed that an environment variable named ANDROID_SDK_ROOT was added automatically (without my intervention).

I propose that AddQtAndroidApk could use indifferently  $ENV{ANDROID_SDK} or ENV{ANDROID_SDK_ROOT}.
This commit is contained in:
Pascal Thomet 2020-05-12 20:38:05 +02:00 committed by GitHub
parent fc1dad67e9
commit d4470e1680
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
AddQtAndroidApk.cmake
View File

@ -26,7 +26,10 @@ message(STATUS "Found Qt for Android: ${QT_ANDROID_QT_ROOT}")
if(NOT QT_ANDROID_SDK_ROOT)
set(QT_ANDROID_SDK_ROOT $ENV{ANDROID_SDK})
if(NOT QT_ANDROID_SDK_ROOT)
message(FATAL_ERROR "Could not find the Android SDK. Please set either the ANDROID_SDK environment variable, or the QT_ANDROID_SDK_ROOT CMake variable to the root directory of the Android SDK")
set(QT_ANDROID_SDK_ROOT $ENV{ANDROID_SDK_ROOT})
if(NOT QT_ANDROID_SDK_ROOT)
message(FATAL_ERROR "Could not find the Android SDK. Please set either the ANDROID_SDK environment variable, or the QT_ANDROID_SDK_ROOT CMake variable to the root directory of the Android SDK")
endif()
endif()
endif()
string(REPLACE "\\" "/" QT_ANDROID_SDK_ROOT ${QT_ANDROID_SDK_ROOT}) # androiddeployqt doesn't like backslashes in paths