Fix:graphics_win32:Transform non-opaque, grayscale etc png files to RGBA format properly.

[profile/ivi/navit.git] / navit / cmake / version.cmake

diff --git a/navit/cmake/version.cmake b/navit/cmake/version.cmake
index 4f9c6d0..413bf0e 100644 (file)
--- a/navit/cmake/version.cmake
+++ b/navit/cmake/version.cmake
@@ -1,4 +1,4 @@
-FIND_PROGRAM(GIT_EXECUTABLE git DOC "git command line client")
+FIND_PROGRAM(GIT_EXECUTABLE NAMES git git.exe DOC "git command line client")
 
 get_filename_component(SOURCE_DIR ${SRC} PATH)
 
@@ -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,12 @@ if (NOT VERSION)
    )
    endif(Subversion_FOUND)
 
-   if (VERSION)
+   if (VERSION AND (NOT ${VERSION} MATCHES "^exported"))
+      if (STRIP_M) 
+         string(REGEX REPLACE "M$" "" VERSION ${VERSION})
+      endif()
       set( ${NAME} ${VERSION} )
-   endif(VERSION)
+   endif()
 else()
    string(REGEX REPLACE "Revision: " "" ${NAME} ${VERSION})
 endif(NOT VERSION)