diff options
| author | Aleix Pol <aleixpol@kde.org> | 2018-04-17 18:34:23 +0200 |
|---|---|---|
| committer | Aleix Pol <aleixpol@kde.org> | 2018-04-17 18:36:00 +0200 |
| commit | 89fd1b3f39eae88658406486500cd46aa22889fb (patch) | |
| tree | fc6851f83e7ceec8ec53966d7941a985d5f866eb | |
| parent | dbe4d2d7f9d6e8179d38a73481e59d5ebb4c43fe (diff) | |
| download | extra-cmake-modules-89fd1b3f39eae88658406486500cd46aa22889fb.tar.gz extra-cmake-modules-89fd1b3f39eae88658406486500cd46aa22889fb.tar.bz2 | |
Android: fix dumb mistakes
Use the variable we just created to look up Qt5.
Remove debug warning.
| -rw-r--r-- | toolchain/Android.cmake | 1 | ||||
| -rw-r--r-- | toolchain/ECMAndroidDeployQt.cmake | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/toolchain/Android.cmake b/toolchain/Android.cmake index 8254304c..517aabec 100644 --- a/toolchain/Android.cmake +++ b/toolchain/Android.cmake @@ -197,7 +197,6 @@ if(DEFINED QTANDROID_EXPORTED_TARGET AND NOT TARGET "create-apk") if(APK_DIR AND NOT EXISTS "${APK_DIR}/AndroidManifest.xml") message(FATAL_ERROR "Cannot find ${APK_DIR}/AndroidManifest.xml according to ANDROID_APK_DIR. ${ANDROID_APK_DIR} ${exportedTarget}") endif() - message(WARNING "${idx} ${last} -- ecm_androiddeployqt(\"${exportedTarget}\" \"${ECM_ADDITIONAL_FIND_ROOT_PATH}\" \"${APK_DIR}\")") ecm_androiddeployqt("${exportedTarget}" "${ECM_ADDITIONAL_FIND_ROOT_PATH}" "${APK_DIR}") endforeach() else() diff --git a/toolchain/ECMAndroidDeployQt.cmake b/toolchain/ECMAndroidDeployQt.cmake index da786ed8..d9f3781f 100644 --- a/toolchain/ECMAndroidDeployQt.cmake +++ b/toolchain/ECMAndroidDeployQt.cmake @@ -1,7 +1,7 @@ find_package(Qt5Core REQUIRED) function(ecm_androiddeployqt QTANDROID_EXPORTED_TARGET ECM_ADDITIONAL_FIND_ROOT_PATH ANDROID_APK_DIR) - get_filename_component(_qt5Core_install_prefix "${Qt5_DIR}/../../../" ABSOLUTE) + get_filename_component(_qt5Core_install_prefix "${Qt5Core_DIR}/../../../" ABSOLUTE) if(NOT ANDROID_APK_DIR) set(ANDROID_APK_DIR "${_qt5Core_install_prefix}/src/android/templates/") endif() |