aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAleix Pol <aleixpol@kde.org>2017-03-17 17:17:22 +0100
committerAleix Pol <aleixpol@kde.org>2017-03-17 17:17:22 +0100
commitd3feb0a9821cd0f2d2a87e6717a2710613d0ecf3 (patch)
tree0e1b372a74e7e95bf8341ffb5955a26b54b6dfc5
parentc5d92deff24578f8258a724ca8a143c2d5f390a1 (diff)
downloadextra-cmake-modules-d3feb0a9821cd0f2d2a87e6717a2710613d0ecf3.tar.gz
extra-cmake-modules-d3feb0a9821cd0f2d2a87e6717a2710613d0ecf3.tar.bz2
Improve error messages
-rw-r--r--toolchain/Android.cmake4
1 files changed, 3 insertions, 1 deletions
diff --git a/toolchain/Android.cmake b/toolchain/Android.cmake
index 9600e655..3314abf9 100644
--- a/toolchain/Android.cmake
+++ b/toolchain/Android.cmake
@@ -225,8 +225,10 @@ set(CREATEAPK_TARGET_NAME "create-apk-${QTANDROID_EXPORTED_TARGET}")
# from CMakeDetermineSystem.cmake and from CMakeSystem.cmake generated within the
# build directory.
if(DEFINED QTANDROID_EXPORTED_TARGET AND NOT TARGET ${CREATEAPK_TARGET_NAME})
- if(NOT EXISTS "${ANDROID_APK_DIR}/AndroidManifest.xml")
+ if(NOT DEFINED ANDROID_APK_DIR)
message(FATAL_ERROR "Define an apk dir to initialize from using -DANDROID_APK_DIR=<path>. The specified directory must contain the AndroidManifest.xml file.")
+ elseif(NOT EXISTS "${ANDROID_APK_DIR}/AndroidManifest.xml")
+ message(FATAL_ERROR "Cannot find ${ANDROID_APK_DIR}/AndroidManifest.xml according to ANDROID_APK_DIR")
endif()
find_package(Qt5Core REQUIRED)