Merge remote-tracking branch 'upstream/master'

cmake/Modules/UseVersion.cmake

@@ -23,6 +23,15 @@ else ()
 	find_package (Git)
   endif ()
 
+  # if git is *still* not found means it is not present on the
+  # system, so there is "no" way we can update the SHA. notice
+  # that this is a slightly different version of the label than
+  # above.
+  if (NOT GIT_FOUND)
+	file (WRITE "${PROJECT_BINARY_DIR}/project-version.h"
+	  "#define PROJECT_VERSION \"${${project}_LABEL}\"\n"
+	  )
+  else ()
 	add_custom_target (update-version ALL
 	  COMMAND ${CMAKE_COMMAND}
 	  -DCMAKE_HOME_DIRECTORY=${CMAKE_HOME_DIRECTORY}
@@ -39,3 +48,4 @@ else ()
 	# any changes it does.
 	add_dependencies (${${project}_TARGET} update-version)
   endif ()
+endif ()