Fix:Build:Ensure android version number is numeric

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

diff --git a/navit/cmake/version.cmake b/navit/cmake/version.cmake
index 3cf26d5..413bf0e 100644 (file)
--- a/navit/cmake/version.cmake
+++ b/navit/cmake/version.cmake
@@ -28,6 +28,9 @@ if (NOT VERSION)
    endif(Subversion_FOUND)
 
    if (VERSION AND (NOT ${VERSION} MATCHES "^exported"))
+      if (STRIP_M) 
+         string(REGEX REPLACE "M$" "" VERSION ${VERSION})
+      endif()
       set( ${NAME} ${VERSION} )
    endif()
 else()

diff --git a/navit/navit/android/CMakeLists.txt b/navit/navit/android/CMakeLists.txt
index d2532ee..a197fab 100644 (file)
--- a/navit/navit/android/CMakeLists.txt
+++ b/navit/navit/android/CMakeLists.txt
@@ -16,6 +16,7 @@ if (ANDROID)
                                -D ANDROID_VERSION_NAME=${PACKAGE_STRING}
                                -D ANDROID_API_VERSION=${ANDROID_API_VERSION}
                                -D ANDROID_PERMISSIONS:string="${ANDROID_PERMISSIONS_EXPANDED}"
+                               -D STRIP_M="1"
                                -P ${PROJECT_SOURCE_DIR}/cmake/version.cmake
    )