cmake: Move extracting git information to src/base cmake config file.

2 files changed, 25 insertions, 31 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 69f990903..617ca2780 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -5,6 +5,7 @@ if(POLICY CMP0075)
 endif()
 
 #-----------------------------------------------------------------------------#
+# Project configuration
 
 project(cvc4)
 
@@ -42,8 +43,6 @@ set(PACKAGE_NAME "${PROJECT_NAME}")
 ## Define to the address where bug reports for this package should be sent.
 #set(PACKAGE_BUGREPORT "cvc4-bugs@cs.stanford.edu")
 
-#-----------------------------------------------------------------------------#
-
 set(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake)
 set(CMAKE_C_STANDARD 99)
 set(CMAKE_CXX_STANDARD 11)
@@ -128,7 +127,6 @@ set(GPL_LIBS "")
 #-----------------------------------------------------------------------------#
 # Build types
 
-
 # Note: Module CodeCoverage requires the name of the debug build to conform
 #       to cmake standards (first letter uppercase).
 set(BUILD_TYPES Production Debug Testing Competition)
@@ -404,23 +402,6 @@ if(GPL_LIBS)
 endif()
 
 #-----------------------------------------------------------------------------#
-
-include(GetGitRevisionDescription)
-get_git_head_revision(GIT_REFSPEC GIT_SHA1)
-git_local_changes(GIT_IS_DIRTY)
-if(${GIT_IS_DIRTY} STREQUAL "DIRTY")
-  set(GIT_IS_DIRTY "true")
-else()
-  set(GIT_IS_DIRTY "false")
-endif()
-
-execute_process(
-  COMMAND "${GIT_EXECUTABLE}" rev-parse --abbrev-ref HEAD
-  OUTPUT_VARIABLE GIT_BRANCH
-  OUTPUT_STRIP_TRAILING_WHITESPACE
-)
-
-#-----------------------------------------------------------------------------#
 # Generate CVC4's cvc4autoconfig.h header
 
 include(ConfigureCVC4)
@@ -436,7 +417,7 @@ if(ENABLE_PROOFS)
 endif()
 
 add_subdirectory(doc)
-add_subdirectory(examples EXCLUDE_FROM_ALL)
+add_subdirectory(examples EXCLUDE_FROM_ALL)  # excluded from all target
 add_subdirectory(src)
 add_subdirectory(test)
 
@@ -529,14 +510,7 @@ message("")
 message("CPPLAGS (-D...)      : ${CVC4_DEFINITIONS}")
 message("CXXFLAGS             : ${CMAKE_CXX_FLAGS}")
 message("CFLAGS               : ${CMAKE_C_FLAGS}")
-#message("LIBS         : ${LIBS}")
-#message("LDFLAGS      : ${LDFLAGS}")
-#message("")
-#message("libcvc4 version        : ${{CVC4_LIBRARY_VERSION}")
-#message("libcvc4parser version  : ${CVC4_PARSER_LIBRARY_VERSION}")
-#message("libcvc4compat version  : ${CVC4_COMPAT_LIBRARY_VERSION_or_nobuild}")
-#message("libcvc4bindings version: ${CVC4_BINDINGS_LIBRARY_VERSION_or_nobuild}")
-#message("")
+message("")
 message("Install prefix       : ${CMAKE_INSTALL_PREFIX}")
 message("")
 
diff --git a/src/base/CMakeLists.txt b/src/base/CMakeLists.txt
index 320049c8c..9ef564df8 100644
--- a/src/base/CMakeLists.txt
+++ b/src/base/CMakeLists.txt
@@ -1,3 +1,23 @@
+#-----------------------------------------------------------------------------#
+# Extract info from Git for git_versioninfo.cpp
+
+include(GetGitRevisionDescription)
+get_git_head_revision(GIT_REFSPEC GIT_SHA1)
+git_local_changes(GIT_IS_DIRTY)
+if(${GIT_IS_DIRTY} STREQUAL "DIRTY")
+  set(GIT_IS_DIRTY "true")
+else()
+  set(GIT_IS_DIRTY "false")
+endif()
+execute_process(
+  COMMAND "${GIT_EXECUTABLE}" rev-parse --abbrev-ref HEAD
+  OUTPUT_VARIABLE GIT_BRANCH
+  OUTPUT_STRIP_TRAILING_WHITESPACE
+)
+
+#-----------------------------------------------------------------------------#
+# Generate git_versioninfo.cpp
+
 configure_file(git_versioninfo.cpp.in git_versioninfo.cpp)
 
 libcvc4_add_sources(
@@ -19,9 +39,9 @@ libcvc4_add_sources(
 
 libcvc4_add_sources(GENERATED git_versioninfo.cpp)
 
-#
+#-----------------------------------------------------------------------------#
 # Generate code for debug/trace tags
-#
+
 set(gentmptags_script ${CMAKE_CURRENT_LIST_DIR}/gentmptags.sh)
 set(gentags_script ${CMAKE_CURRENT_LIST_DIR}/gentags.sh)
 set(genheader_script ${CMAKE_CURRENT_LIST_DIR}/genheader.sh)