Separate release.cmake (stored in git repo), and version.cmake (generated on-the-fly when possible)

Author: gbitzes

CMakeLists.txt

@@ -35,7 +35,9 @@ execute_process(
 #
 # A bit hacky.
 #-------------------------------------------------------------------------------
-include(version.cmake REQUIRED)
+include(release.cmake REQUIRED)
+include(version.cmake)
+message("Configuring cmake for davix version: ${VERSION_FULL}")
 
 set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/modules/")
 option(SHARED_LIBRARY "generate shared library" TRUE)

RELEASE-NOTES.md

@@ -6,7 +6,7 @@
 * Prevent genversion.py from getting confused with non-davix git repositories (Thanks to Chris Burr)
 
 ### Improvements
-* Include version.cmake in the Git repository, and update during each release to prevent confusing people with cryptic cmake errors. version.cmake will be updated by genversion.py as before, when possible.
+* Fix cryptic cmake errors encountered sometimes when building from a tarball.
 
 ## 0.7.3 (2019-05-08)
 ### Bug fixes

dist/new-release.sh

@@ -55,14 +55,14 @@ function edit_deb_changelog {
   sed -i "1i $line1\n$line2\n$line3" packaging/debian/changelog
 }
 
-function update_version_cmakefile {
-  ./genversion.py --template version.cmake.in --out version.cmake --custom-version "R_${major}_${minor}_${patch}"
+function update_release_cmakefile {
+  ./genversion.py --template version.cmake.in --out release.cmake --custom-version "R_${major}_${minor}_${patch}"
 }
 
 function git_commit {
   echo "Creating commit.."
   git add .
-  git add --force version.cmake
+  git add --force release.cmake
   git commit -e -m "RELEASE: $major.$minor.$patch"
 }
 
@@ -107,7 +107,7 @@ get_author
 edit_rpm_spec
 edit_deb_changelog
 
-update_version_cmakefile
+update_release_cmakefile
 git_commit
 git_tag
 

release.cmake

@@ -0,0 +1,5 @@
+set(VERSION_MAJOR 0)
+set(VERSION_MINOR 7)
+set(VERSION_PATCH 3)
+set(VERSION_MINIPATCH @VERSION_MINIPATCH@)
+set(VERSION_FULL 0.7.3)

version.cmake.in

@@ -3,5 +3,3 @@ set(VERSION_MINOR @VERSION_MINOR@)
 set(VERSION_PATCH @VERSION_PATCH@)
 set(VERSION_MINIPATCH @VERSION_MINIPATCH@)
 set(VERSION_FULL @VERSION_FULL@)
-
-message("Configuring cmake for davix version: ${VERSION_FULL}")