MCOL-939 Templating the version number header file with CMake.

CMakeLists.txt

@@ -36,6 +36,7 @@ ENDIF(NOT CMAKE_BUILD_TYPE)
 
 #set( CMAKE_VERBOSE_MAKEFILE on )
 
+SET(TOP_SRC_DIR ${CMAKE_SOURCE_DIR})
 INCLUDE(columnstore_version.cmake)
 
 SET (PACKAGE columnstore)

columnstore_version.cmake

@@ -1,16 +1,16 @@
-
+# The CMakeLists.txt that includes this file must set ${TOP_SRC_DIR} variable beforehand. 
 
 # Generate "something" to trigger cmake rerun when VERSION changes
 CONFIGURE_FILE(
-  ${CMAKE_SOURCE_DIR}/VERSION
-  ${CMAKE_BINARY_DIR}/VERSION.dep
+  ${TOP_SRC_DIR}/VERSION
+  ${TOP_SRC_DIR}/VERSION.dep
 )
 
 # Read value for a variable from VERSION.
 
 MACRO(COLUMNSTORE_GET_CONFIG_VALUE keyword var)
  IF(NOT ${var})
-   FILE (STRINGS ${CMAKE_SOURCE_DIR}/VERSION str REGEX "^[ ]*${keyword}=")
+   FILE (STRINGS ${TOP_SRC_DIR}/VERSION str REGEX "^[ ]*${keyword}=")
    IF(str)
      STRING(REPLACE "${keyword}=" "" str ${str})
      STRING(REGEX REPLACE  "[ ].*" ""  str "${str}")
@@ -43,4 +43,4 @@ IF(NOT "${MAJOR_VERSION}" MATCHES "[0-9]+" OR
 ENDMACRO()
 
 # Get columnstore version
-GET_COLUMNSTORE_VERSION()
+GET_COLUMNSTORE_VERSION()

dbcon/mysql/CMakeLists.txt

@@ -21,6 +21,10 @@ SET ( libcalmysql_SRCS
 
 add_definitions(-DMYSQL_DYNAMIC_PLUGIN)
 
+SET(TOP_SRC_DIR "../../")
+INCLUDE(../../columnstore_version.cmake)
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/versionnumber.h.in ${CMAKE_CURRENT_SOURCE_DIR}/versionnumber.h)
+
 set_source_files_properties(ha_calpont.cpp PROPERTIES COMPILE_FLAGS "-fno-rtti -fno-implicit-templates")
 
 add_library(calmysql SHARED ${libcalmysql_SRCS})

dbcon/mysql/versionnumber.h.in

@@ -0,0 +1,8 @@
+
+#ifndef VERSIONNUMBER_H_
+#define VERSIONNUMBER_H_
+#include <string>
+const std::string idb_version("${VERSION}");
+const std::string idb_release("${PACKAGE_RELEASE}");
+#endif
+