Fixed git.exe path in CMakeLists.txt

firelab · Jan 15, 2015 · 3628e91 · 3628e91
1 parent 32fd208
commit 3628e91
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -47,7 +47,7 @@ SET(WINDNINJA_VERSION_MAJOR "2")
 SET(WINDNINJA_VERSION_MINOR "4")
 SET(WINDNINJA_VERSION_PATCH "1")
 OPTION(GENERATE_VERSION_INFO "Write version info files." OFF)
-IF(GENERATE_VERSION_INFO OR FIRELAB_PACKAGE)
+IF(GENERATE_VERSION_INFO)
     FILE(READ ${CMAKE_SOURCE_DIR}/VERSION V)
     STRING(REPLACE "\n" "" V ${V})
     IF(V)
@@ -65,7 +65,12 @@ IF(GENERATE_VERSION_INFO OR FIRELAB_PACKAGE)
     ENDIF(V)
     SET(WINDNINJA_VERSION ${WINDNINJA_VERSION_MAJOR}.${WINDNINJA_VERSION_MINOR}.${WINDNINJA_VERSION_PATCH})
     FILE(READ ${CMAKE_SOURCE_DIR}/disclaimer VERSION_HEADER)
-    EXECUTE_PROCESS(COMMAND "git" "rev-parse" "HEAD"
+    IF(NOT GITCOMMAND)
+	    SET(GIT_EXE git)
+	ELSE(NOT GITCOMMAND)
+		SET(GIT_EXE ${GITCOMMAND})
+    ENDIF(NOT GITCOMMAND)
+	EXECUTE_PROCESS(COMMAND ${GIT_EXE} "rev-parse" "HEAD"
                     WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
                     RESULT_VARIABLE GIT_RC
                     OUTPUT_VARIABLE GIT_REV)
@@ -85,7 +90,7 @@ IF(GENERATE_VERSION_INFO OR FIRELAB_PACKAGE)
 #define RELEASE_DATE \"${GD_MONTH}/${GD_DAY}/${GD_YEAR}\"
 #endif /* VERSION_H */\n")
     FILE(WRITE "${CMAKE_SOURCE_DIR}/src/version.h" ${V})
-ENDIF(GENERATE_VERSION_INFO OR FIRELAB_PACKAGE)
+ENDIF(GENERATE_VERSION_INFO)
 SET(WINDNINJA_VERSION ${WINDNINJA_VERSION_MAJOR}.${WINDNINJA_VERSION_MINOR}.${WINDNINJA_VERSION_PATCH})
 
 # *****************************************************************************