diff options
| author | Aleix Pol <aleixpol@kde.org> | 2015-09-13 01:57:58 +0200 |
|---|---|---|
| committer | Aleix Pol <aleixpol@kde.org> | 2015-09-13 01:57:58 +0200 |
| commit | 3915bacd6055087bf71ccabc5c9ddf15743f4e9a (patch) | |
| tree | 78a3d8d76ea13f98ced5daef5a58a1fef340a7a4 | |
| parent | 06bda539ab490a9ff96ed03c2817d9317fd9b880 (diff) | |
| download | extra-cmake-modules-3915bacd6055087bf71ccabc5c9ddf15743f4e9a.tar.gz extra-cmake-modules-3915bacd6055087bf71ccabc5c9ddf15743f4e9a.tar.bz2 | |
Use Qt5 to specify what's Qt5 installation prefix
| -rw-r--r-- | toolchain/Android.cmake | 2 | ||||
| -rw-r--r-- | toolchain/deployment-file.json.in | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/toolchain/Android.cmake b/toolchain/Android.cmake index bfc166a8..9b104747 100644 --- a/toolchain/Android.cmake +++ b/toolchain/Android.cmake @@ -172,6 +172,8 @@ if(DEFINED QTANDROID_EXPORTED_TARGET AND NOT TARGET ${CREATEAPK_TARGET_NAME}) message(FATAL_ERROR "Define an apk dir to initialize from using -DANDROID_APK_DIR=<path>. The specified directory must contain the AndroidManifest.xml file.") endif() + find_package(Qt5Core REQUIRED) + function(EOFHook) if(CMAKE_PARENT_LIST_FILE STREQUAL "") generate_deployment_file() diff --git a/toolchain/deployment-file.json.in b/toolchain/deployment-file.json.in index e662795a..1e52e5a0 100644 --- a/toolchain/deployment-file.json.in +++ b/toolchain/deployment-file.json.in @@ -1,5 +1,5 @@ { - "qt": "@QTDIR@", + "qt": "@_qt5Core_install_prefix@", "sdk": "@ANDROID_SDK_ROOT@", "ndk": "@ANDROID_NDK@", "toolchain-prefix": "@ANDROID_TOOLCHAIN@", |