Merge pull request #276 from electronic-structure/develop

Develop
electronic-structure · Oct 3, 2018 · 0883d8f · 0883d8f
2 parents ec4cc32 + 5ee0d6c
commit 0883d8f
Showing 1 changed file with 9 additions and 2 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -134,7 +134,11 @@ include_directories(BEFORE src/SDDK)
 # configure version header
 exec_program("git" ${CMAKE_CURRENT_SOURCE_DIR}
   ARGS "rev-parse HEAD"
-  OUTPUT_VARIABLE GIT_VERSION_SHA1)
+  OUTPUT_VARIABLE GIT_VERSION_SHA1
+  RETURN_VALUE exit_code)
+if(exit_code)
+  set(GIT_VERSION_SHA1 "")
+endif()
 exec_program("date"
   ARGS "+\"%a, %e %b %Y %H:%M:%S\""
   OUTPUT_VARIABLE BUILD_DATE)
@@ -143,7 +147,10 @@ exec_program(
   ${CMAKE_CURRENT_SOURCE_DIR}
   ARGS "describe --all"
   OUTPUT_VARIABLE GIT_BRANCHNAME
-  RETURN_VALUE GIT_QUERY_BRANCH)
+  RETURN_VALUE exit_code)
+if(exit_code)
+  set(GIT_BRANCHNAME "")
+endif()
 configure_file("${PROJECT_SOURCE_DIR}/src/version.hpp.in" "${PROJECT_BINARY_DIR}/src/version.hpp")
 include_directories(BEFORE ${PROJECT_BINARY_DIR}/src)