Merge pull request #715 from rabarar/master

modified version switch to build without .git repo directory and adde…

CMakeLists.txt

@@ -25,6 +25,8 @@ cmake_minimum_required(VERSION 3.2)
 project(Trunk-Recorder LANGUAGES CXX C VERSION "4.3.2")
 
 configure_file(cmake.h.in "${PROJECT_SOURCE_DIR}/cmake.h" @ONLY)
+ADD_COMPILE_DEFINITIONS(MANUAL_GITINFO="${MANUAL_GITINFO}")
+
 
 # Define the two required variables before including
 # the source code for watching a git repository.

git.cc.in

@@ -50,7 +50,11 @@ __attribute__ ((visibility ("default"))) void GitMetadata::VersionInfo() {
                   << "\t" << GitMetadata::CommitSubject() << "\n" << GitMetadata::CommitBody() << std::endl;
     }
     else {
-        std::cerr << "WARN: failed to get the current git state. Is this a git repo?" << std::endl;
+#ifdef MANUAL_GITINFO
+        std::cerr << "INFO: manual git info: " << MANUAL_GITINFO << std::endl;
+#else
+        std::cerr << "WARN: no manual git info defined " << std::endl;
+#endif
     }
 }
 

git_watcher.cmake

@@ -136,7 +136,7 @@ macro(RunGitCommand)
         # those default values.
         if(GIT_FAIL_IF_NONZERO_EXIT )
             string(REPLACE ";" " " args_with_spaces "${ARGV}")
-            message(FATAL_ERROR "${stderr} (${GIT_EXECUTABLE} ${args_with_spaces})")
+            message("${stderr} (${GIT_EXECUTABLE} ${args_with_spaces})")
         endif()
     endif()
 endmacro()