Fix:build/cmake:Fixed AndroidManifest in case no svn revision number could be extracted.

git-svn-id: https://navit.svn.sourceforge.net/svnroot/navit/trunk@4337 ffa7fe5e-494d-0410-b361-a75ebd5db220

diff --git a/navit/cmake/version.cmake b/navit/cmake/version.cmake
index 64a97fb..3cf26d5 100644 (file)
--- a/navit/cmake/version.cmake
+++ b/navit/cmake/version.cmake
@@ -10,7 +10,9 @@ EXECUTE_PROCESS(
      OUTPUT_STRIP_TRAILING_WHITESPACE
 )
 
-set( ${NAME} "unknown" )
+if (NOT DEFINED ${NAME})
+   set( ${NAME} "unknown" )
+endif()
 
 if (NOT VERSION)
    FIND_PACKAGE(Subversion)
@@ -25,9 +27,9 @@ if (NOT VERSION)
    )
    endif(Subversion_FOUND)
 
-   if (VERSION)
+   if (VERSION AND (NOT ${VERSION} MATCHES "^exported"))
       set( ${NAME} ${VERSION} )
-   endif(VERSION)
+   endif()
 else()
    string(REGEX REPLACE "Revision: " "" ${NAME} ${VERSION})
 endif(NOT VERSION)

diff --git a/navit/navit/android/CMakeLists.txt b/navit/navit/android/CMakeLists.txt
index 1723eff..f14b2f0 100644 (file)
--- a/navit/navit/android/CMakeLists.txt
+++ b/navit/navit/android/CMakeLists.txt
@@ -7,6 +7,7 @@ if (ANDROID)
       DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/AndroidManifest.xml.cmake
       COMMAND ${CMAKE_COMMAND} -D SRC=${CMAKE_CURRENT_SOURCE_DIR}/AndroidManifest.xml.cmake
                                -D DST=${CMAKE_CURRENT_BINARY_DIR}/AndroidManifest.xml
+                               -D ANDROID_VERSION_INT="0"
                                -D NAME=ANDROID_VERSION_INT
                                -D ANDROID_VERSION_NAME=${PACKAGE_STRING}
                                -D ANDROID_API_VERSION=${ANDROID_API_VERSION}