cmake: Use REPO_VERSION flag

Author: AlexisMontagne

CMakeLists.txt

@@ -31,11 +31,14 @@ set(CMAKE_MODULE_PATH "${CMAKE_MODULE_PATH}" "${CMAKE_CURRENT_SOURCE_DIR}/build/
 # TODO: add `git rev-parse --short HEAD`
 # Read the version information from the Autoconf file
 file (STRINGS "${CMAKE_CURRENT_SOURCE_DIR}/configure.ac" CONFIGURE_AC REGEX "AC_INIT\\(.*\\)" )
+option (THRIFT_VERSION "VERSION" ${CONFIGURE_AC})
 
 # The following variable is used in the version.h.in file
-string(REGEX REPLACE "AC_INIT\\(\\[.*\\], \\[([0-9]+\\.[0-9]+\\.[0-9]+(-upfluence)?)\\]\\)" "\\1" PACKAGE_VERSION ${CONFIGURE_AC})
+string(REGEX REPLACE "AC_INIT\\(\\[.*\\], \\[([0-9]+\\.[0-9]+\\.[0-9]+(-upfluence)?)\\]\\)" "\\1" PACKAGE_VERSION ${THRIFT_VERSION})
 message(STATUS "Parsed Thrift package version: ${PACKAGE_VERSION}")
 
+set(REPO_VERSION "${THRIFT_VERSION}")
+
 # These are internal to CMake
 string(REGEX REPLACE "([0-9]+\\.[0-9]+\\.[0-9]+)(-upfluence)?" "\\1" thrift_VERSION ${PACKAGE_VERSION})
 string(REGEX REPLACE "([0-9]+)\\.[0-9]+\\.[0-9]+" "\\1" thrift_VERSION_MAJOR ${thrift_VERSION})

compiler/cpp/cmake_install.cmake

@@ -1,3 +1,3 @@
-#define THRIFT_VERSION "@PACKAGE_VERSION@"
+#define THRIFT_VERSION "@REPO_VERSION@"
 #define THRIFT_TYPES_PATH "@TYPES_PREFIX@"
 #define THRIFT_TYPES_NESTED_PATH "@TYPES_PREFIX@/types"

compiler/cpp/version.h.in

@@ -20,7 +20,10 @@
 AC_PREREQ(2.65)
 AC_CONFIG_MACRO_DIR([./aclocal])
 
-AC_INIT([thrift], [2.5.1-upfluence])
+AC_ARG_VAR([REPO_VERSION], [])
+AS_IF([test "x$REPO_VERSION" = x], [REPO_VERSION="dirty"])
+
+AC_INIT([thrift], [1.0.0])
 
 AC_CONFIG_AUX_DIR([.])