[cig-commits] [commit] master: Add QuakeLib Git revision tracking (2aa1e55)

[cig_noreply at geodynamics.org]

Repository : https://github.com/geodynamics/vq

On branch  : master
Link       : https://github.com/geodynamics/vq/compare/0ca7695073f8b223d815f10653613b02b6c47df8...197914f4e03e55d321cae45161deafb1a5ade706

>---------------------------------------------------------------

commit 2aa1e55b48a149604cf8c91b6c530e7c6e297bea
Author: Eric Heien <emheien at ucdavis.edu>
Date:   Tue Oct 28 15:19:50 2014 -0700

    Add QuakeLib Git revision tracking


>---------------------------------------------------------------

2aa1e55b48a149604cf8c91b6c530e7c6e297bea
 quakelib/CMakeLists.txt       | 7 +++++++
 quakelib/quakelib_config.h.in | 1 +
 quakelib/src/QuakeLib.h       | 3 +++
 3 files changed, 11 insertions(+)

diff --git a/quakelib/CMakeLists.txt b/quakelib/CMakeLists.txt
index 0830736..0d92a5e 100644
--- a/quakelib/CMakeLists.txt
+++ b/quakelib/CMakeLists.txt
@@ -11,6 +11,13 @@ SET(QUAKELIB_VERSION_MINOR 2)
 SET(QUAKELIB_VERSION_SUBMINOR 0)
 SET(QUAKELIB_VERSION_STR "${QUAKELIB_VERSION_MAJOR}.${QUAKELIB_VERSION_MINOR}.${QUAKELIB_VERSION_SUBMINOR}")
 
+# Find a Git installation and the source Git revision if available
+FIND_PACKAGE(Git)
+IF(GIT_FOUND)
+    INCLUDE(GetGitRevisionDescription)
+    GET_GIT_HEAD_REVISION(QUAKELIB_GIT_REFSPEC QUAKELIB_GIT_SHA1)
+ENDIF(GIT_FOUND)
+
 # Enable testing framework
 INCLUDE (CTest)
 
diff --git a/quakelib/quakelib_config.h.in b/quakelib/quakelib_config.h.in
index 8aec066..ad56291 100644
--- a/quakelib/quakelib_config.h.in
+++ b/quakelib/quakelib_config.h.in
@@ -10,5 +10,6 @@
 #cmakedefine MPI_C_FOUND
 #cmakedefine GEOGRAPHICLIB_FOUND
 #cmakedefine QUAKELIB_VERSION_STR "@QUAKELIB_VERSION_STR@"
+#cmakedefine QUAKELIB_GIT_SHA1 "@QUAKELIB_GIT_SHA1@"
 #endif
 
diff --git a/quakelib/src/QuakeLib.h b/quakelib/src/QuakeLib.h
index 91aef7e..158169b 100644
--- a/quakelib/src/QuakeLib.h
+++ b/quakelib/src/QuakeLib.h
@@ -38,6 +38,9 @@ namespace quakelib {
     static std::string quakelib_info(void) {
         std::stringstream ss;
         ss << "QuakeLib " << QUAKELIB_VERSION_STR;
+#ifdef QUAKELIB_GIT_SHA1
+        ss << " Git revision " << QUAKELIB_GIT_SHA1;
+#endif
         return ss.str();
     };