diff options
| author | rikky <rikky@ffa7fe5e-494d-0410-b361-a75ebd5db220> | 2011-03-12 20:41:34 +0000 |
|---|---|---|
| committer | rikky <rikky@ffa7fe5e-494d-0410-b361-a75ebd5db220> | 2011-03-12 20:41:34 +0000 |
| commit | be0e49567d271ab12ebaa78f7be279c7123c5b4b (patch) | |
| tree | ad735b6df35739e242e5bcbe46b8012190e4d393 | |
| parent | a73529007b7038793ae9f466a2456d09a7bc8639 (diff) | |
| download | navit-svn-be0e49567d271ab12ebaa78f7be279c7123c5b4b.tar.gz | |
Fix:build/cmake:Fixed AndroidManifest in case no svn revision number could be extracted.
git-svn-id: http://svn.code.sf.net/p/navit/code/trunk/navit@4337 ffa7fe5e-494d-0410-b361-a75ebd5db220
| -rw-r--r-- | cmake/version.cmake | 8 | ||||
| -rw-r--r-- | navit/android/CMakeLists.txt | 1 |
2 files changed, 6 insertions, 3 deletions
diff --git a/cmake/version.cmake b/cmake/version.cmake index 64a97fb6..3cf26d54 100644 --- a/cmake/version.cmake +++ b/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/android/CMakeLists.txt b/navit/android/CMakeLists.txt index 1723eff1..f14b2f07 100644 --- a/navit/android/CMakeLists.txt +++ b/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} |