Make GIT information in the version optional

And off by default. Add a command to build a source distribution.

Author: befulton

CMakeLists.txt

@@ -38,6 +38,7 @@ set(OPTIMIZER_STRATEGY "NelderMead" CACHE STRING "Optimizer strategy (LBFGS, Nel
 set(DISCRETIZATION_RANGE "200" CACHE STRING "How finely to divide the continuous range")
 option(MODEL_GENE_EXPRESSION_LOGS "Perform calculations using log values rather than linear values" ON)
 option(USE_MAX_PROBABILITY "Evaluate probability as maximum value rather than cumulative" OFF)
+option(INCLUDE_GIT_IN_VERSION_INFO "Write information about the last GIT commit into version info" OFF)
 
 if (MODEL_GENE_EXPRESSION_LOGS)
   add_definitions(-DMODEL_GENE_EXPRESSION_LOGS)
@@ -50,16 +51,20 @@ endif()
 add_definitions(-DOPTIMIZER_STRATEGY=${OPTIMIZER_STRATEGY})
 add_definitions(-DDISCRETIZATION_RANGE=${DISCRETIZATION_RANGE})
 
-# Define the two required variables before including
-# the source code for watching a git repository.
-set(PRE_CONFIGURE_FILE "git_version.cpp.in")
-set(POST_CONFIGURE_FILE "${CMAKE_CURRENT_BINARY_DIR}/git_version.cpp")
-include(git_watcher.cmake)
 
-# Create a library out of the compiled post-configure file.
-add_library(git STATIC ${POST_CONFIGURE_FILE})
-target_include_directories(git PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
-add_dependencies(git check_git)
+if (INCLUDE_GIT_IN_VERSION_INFO)
+  # Define the two required variables before including
+  # the source code for watching a git repository.
+  set(PRE_CONFIGURE_FILE "git_version.cpp.in")
+  set(POST_CONFIGURE_FILE "${CMAKE_CURRENT_BINARY_DIR}/git_version.cpp")
+  include(git_watcher.cmake)
+
+  # Create a library out of the compiled post-configure file.
+  add_definitions(-DINCLUDE_GIT_IN_VERSION_INFO)
+  add_library(git STATIC ${POST_CONFIGURE_FILE})
+  target_include_directories(git PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
+  add_dependencies(git check_git)
+endif()
 
 # add the executable
 add_executable(cagee main.cpp)
@@ -77,8 +82,10 @@ add_subdirectory(src)
 
 link_libraries(Eigen3::Eigen)
 
-target_link_libraries(cagee PRIVATE git)
-target_link_libraries(tests PRIVATE git)
+if (INCLUDE_GIT_IN_VERSION_INFO)
+  target_link_libraries(cagee PRIVATE git)
+  target_link_libraries(tests PRIVATE git)
+endif()
 
 find_package(ZLIB)
 target_link_libraries(cagee PRIVATE ZLIB::ZLIB)

build_dist.sh

@@ -0,0 +1,3 @@
+mkdir distro
+
+tar --transform "s,^,CAGEE/," --owner=0 --group=0 -czf distro/CAGEE0.1.0.0.tar.gz src test.cpp main.cpp diffmat_precalc.cpp CHANGELOG.md LICENSE CMakeLists.txt README.md config.h.in examples LBFGSpp/

src/arguments.cpp

@@ -11,7 +11,10 @@ namespace po = boost::program_options;
 
 #include "arguments.h"
 #include "io.h"
+
+#ifdef INCLUDE_GIT_IN_VERSION_INFO
 #include "../git_version.h"
+#endif
 
 using namespace std;
 
@@ -33,6 +36,7 @@ void show_version()
     cout << PROJECT_NAME " " PROJECT_VER << endl;
     cout << desc;
 
+#ifdef INCLUDE_GIT_IN_VERSION_INFO
     if (GitMetadata::Populated()) {
         cout << "Last git commit: \n";
         if (GitMetadata::AnyUncommittedChanges()) {
@@ -44,6 +48,7 @@ void show_version()
             << "Date: " << GitMetadata::CommitDate() << "\n\n"
             << GitMetadata::CommitSubject() << "\n" << GitMetadata::CommitBody() << std::endl;
     }
+#endif
 }
 void show_help(const po::options_description& gen, const po::options_description& required, const po::options_description& common, const po::options_description& rare)
 {