summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrikky <rikky@ffa7fe5e-494d-0410-b361-a75ebd5db220>2012-08-18 22:10:16 +0000
committerrikky <rikky@ffa7fe5e-494d-0410-b361-a75ebd5db220>2012-08-18 22:10:16 +0000
commitb2f0b57a6d788a98721352ab9c68780fc383ac4d (patch)
treeafb2c15559879c978f7e80299de1a523d4b7f589
parentdd930c1c450f00b8a217361642bb16b2203af4bb (diff)
downloadnavit-b2f0b57a6d788a98721352ab9c68780fc383ac4d.tar.gz
Add:Android:Warn about old ant version
git-svn-id: http://svn.code.sf.net/p/navit/code/trunk/navit@5209 ffa7fe5e-494d-0410-b361-a75ebd5db220
-rwxr-xr-xCMakeLists.txt5
-rw-r--r--cmake/build.xml7
2 files changed, 12 insertions, 0 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 06cc8e0c0..ecd5030fc 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -536,6 +536,11 @@ if(ANDROID)
find_program(ANT_LOCATION NAMES ant)
if (NOT ANT_LOCATION)
message_error("Could not find ant. Please install ant and add it to the search path.")
+ else()
+ execute_process(COMMAND ${ANT_LOCATION} WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/cmake RESULT_VARIABLE ANT_VERSION_OK OUTPUT_QUIET ERROR_QUIET)
+ if(ANT_VERSION_OK GREATER 0)
+ message(WARNING "Old ant version detected. If you need crash reporter, update to at least ant 1.8")
+ endif()
endif()
if (NOT ANDROID_LOCATION)
message_error( "Could not find 'Android SDK and AVD Manager'. Please install the android sdk and add the <android-sdk>/tools directory to the search path.")
diff --git a/cmake/build.xml b/cmake/build.xml
new file mode 100644
index 000000000..5a4b47965
--- /dev/null
+++ b/cmake/build.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project name="Navit" default="help">
+<target name="help">
+ <antversion property="antversion" atleast="1.8"/>
+ <fail unless="antversion"/>
+</target>
+</project>