Capture git branch and output

cmake/git_version.cmake

@@ -8,6 +8,14 @@ if (Git_FOUND)
         WORKING_DIRECTORY "${PROJECT_SOURCE_DIR}"
         RESULT_VARIABLE GIT_RESULT
         OUTPUT_VARIABLE VERSION
+        ERROR_QUIET
+		OUTPUT_STRIP_TRAILING_WHITESPACE)
+		
+	execute_process(COMMAND
+        "${GIT_EXECUTABLE}" rev-parse --abbrev-ref HEAD
+        WORKING_DIRECTORY "${PROJECT_SOURCE_DIR}"
+        RESULT_VARIABLE GIT_RESULT
+        OUTPUT_VARIABLE BRANCH
         ERROR_QUIET
         OUTPUT_STRIP_TRAILING_WHITESPACE)
         

components/common/cpp/include/ftl/config.h.in

@@ -22,6 +22,7 @@
 #cmakedefine HAVE_NANOGUI
 #cmakedefine HAVE_LIBARCHIVE
 
+extern const char *FTL_BRANCH;
 extern const char *FTL_VERSION_LONG;
 extern const char *FTL_VERSION;
 extern const int FTL_VERSION_MAJOR;

components/common/cpp/src/config.cpp.in

 #include <ftl/config.h>
 
+const char *FTL_BRANCH = "@BRANCH@";
 const char *FTL_VERSION_LONG = "@VERSION@";
 const char *FTL_VERSION = "";
 const int FTL_VERSION_MAJOR = 0;

components/common/cpp/src/configuration.cpp

@@ -49,7 +49,7 @@ static Configurable *rootCFG = nullptr;
 
 bool ftl::running = true;
 int ftl::exit_code = 0;
-std::string ftl::branch_name = "";
+std::string ftl::branch_name = FTL_BRANCH;
 
 bool ftl::is_directory(const std::string &path) {
 #ifdef WIN32