From f598efe6e04287496f6056a322e3aee44be66ef3 Mon Sep 17 00:00:00 2001
From: Wilfried Goesgens <willi@arangodb.com>
Date: Thu, 25 Aug 2016 11:37:21 +0200
Subject: [PATCH] Cleanup cmake process so it doesn't barf on problems to
 detect the git version.

---
 CMakeLists.txt              | 13 ++++++++++---
 cmake/ArangoDBInstall.cmake |  8 ++++----
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6edd914979..d66d6a4523 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -132,9 +132,14 @@ if (DEFINED GIT_EXE AND IS_DIRECTORY "${CMAKE_SOURCE_DIR}/.git")
     WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
     COMMAND ${GIT_EXE} describe --all --tags --long --dirty=-dirty
     OUTPUT_VARIABLE GIT_OUTPUT)
-  string(STRIP ${GIT_OUTPUT} REPOSITORY_VERSION)
-  set(ARANGODB_BUILD_REPOSITORY ${REPOSITORY_VERSION})
-  set(HAVE_ARANGODB_BUILD_REPOSITORY "1")
+  if (NOT GIT_OUTPUT)
+      set(ARANGODB_BUILD_REPOSITORY "GIT FAILED TO RETRIEVE THE VERSION")
+      set(HAVE_ARANGODB_BUILD_REPOSITORY "1")
+    else()
+      string(STRIP ${GIT_OUTPUT} REPOSITORY_VERSION)
+      set(ARANGODB_BUILD_REPOSITORY ${REPOSITORY_VERSION})
+      set(HAVE_ARANGODB_BUILD_REPOSITORY "1")
+    endif()
 else ()
   set(ARANGODB_BUILD_REPOSITORY "")
   set(HAVE_ARANGODB_BUILD_REPOSITORY "0")
@@ -889,3 +894,5 @@ endif()
 add_custom_target(packages
   DEPENDS ${PACKAGES_LIST}
   )
+
+message(INFO "Building for git revision: ${ARANGODB_BUILD_REPOSITORY}")
diff --git a/cmake/ArangoDBInstall.cmake b/cmake/ArangoDBInstall.cmake
index fdf5ab4642..0dbb5b4ee5 100644
--- a/cmake/ArangoDBInstall.cmake
+++ b/cmake/ArangoDBInstall.cmake
@@ -113,8 +113,8 @@ configure_file (
 
 
 #--------------------------------------------------------------------------------
-get_cmake_property(_variableNames VARIABLES)
-foreach (_variableName ${_variableNames})
-    message(STATUS "${_variableName}=${${_variableName}}")
-endforeach()
+#get_cmake_property(_variableNames VARIABLES)
+#foreach (_variableName ${_variableNames})
+#    message(STATUS "${_variableName}=${${_variableName}}")
+#endforeach()
 #--------------------------------------------------------------------------------