QuasarApp/qt-android-cmake
4
0
Fork 0
mirror of https://github.com/QuasarApp/qt-android-cmake.git synced 2025-05-01 15:59:38 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #37 from pthom/patch-1

Browse Source 
Use env var ANDROID_SDK or ANDROID_SDK_ROOT
This commit is contained in:
Laurent Gomila 2020-05-13 17:47:38 +02:00 committed by GitHub
commit 250fdb2caa
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

3
AddQtAndroidApk.cmake
View File

@ -25,10 +25,13 @@ message(STATUS "Found Qt for Android: ${QT_ANDROID_QT_ROOT}")
# find the Android SDK # find the Android SDK
if(NOT QT_ANDROID_SDK_ROOT) if(NOT QT_ANDROID_SDK_ROOT)
set(QT_ANDROID_SDK_ROOT $ENV{ANDROID_SDK}) set(QT_ANDROID_SDK_ROOT $ENV{ANDROID_SDK})
if(NOT QT_ANDROID_SDK_ROOT)
set(QT_ANDROID_SDK_ROOT $ENV{ANDROID_SDK_ROOT})
if(NOT QT_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") 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() endif()
endif()
string(REPLACE "\\" "/" QT_ANDROID_SDK_ROOT ${QT_ANDROID_SDK_ROOT}) # androiddeployqt doesn't like backslashes in paths string(REPLACE "\\" "/" QT_ANDROID_SDK_ROOT ${QT_ANDROID_SDK_ROOT}) # androiddeployqt doesn't like backslashes in paths
message(STATUS "Found Android SDK: ${QT_ANDROID_SDK_ROOT}") message(STATUS "Found Android SDK: ${QT_ANDROID_SDK_ROOT}")