From 022b219c0fcd68f52dbf7a987211c20278038837 Mon Sep 17 00:00:00 2001 From: Federico Hernandez Date: Sat, 8 Jan 2011 01:10:26 +0100 Subject: [PATCH] CMake - added sha1 of git commit to task diag --- CMakeLists.txt | 7 +++++++ cmake.h.in | 4 ++++ src/diag.cpp | 3 +++ 3 files changed, 14 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 44572ce1c..326124948 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -4,6 +4,13 @@ include (CheckFunctionExists) project (task) set (PROJECT_VERSION "1.9.4") +if (EXISTS .git/index) + set (HAVE_COMMIT true) + execute_process (COMMAND git log -1 --pretty=format:%h + OUTPUT_VARIABLE COMMIT) +endif (EXISTS .git/index) + + set (PACKAGE "${PROJECT_NAME}") set (VERSION "${PROJECT_VERSION}") set (PACKAGE_BUGREPORT "support@taskwarrior.org") diff --git a/cmake.h.in b/cmake.h.in index 047f777de..12209a192 100644 --- a/cmake.h.in +++ b/cmake.h.in @@ -9,6 +9,10 @@ #define PACKAGE_VERSION "${PACKAGE_VERSION}" #define PACKAGE_STRING "${PACKAGE_STRING}" +/* git information */ +#cmakedefine HAVE_COMMIT +#define COMMIT "${COMMIT}" + /* Compiling platform */ #cmakedefine LINUX #cmakedefine DARWIN diff --git a/src/diag.cpp b/src/diag.cpp index b351c1e74..c7b68d222 100644 --- a/src/diag.cpp +++ b/src/diag.cpp @@ -133,6 +133,9 @@ void handleDiagnostics (std::string& outs) std::cout << "Build Features\n" // Build date. << " Built: " << __DATE__ << " " << __TIME__ << "\n" +#ifdef HAVE_COMMIT + << " Commit: " << COMMIT << "\n" +#endif << " Caps:" #ifdef HAVE_LIBPTHREAD << " +pthreads"