Fix version generation

CMakeLists.txt

@@ -32,29 +32,17 @@ aux_source_directory("src" CFILES)
 
 set(GEN_HEADER_PATH "${CMAKE_CURRENT_BINARY_DIR}/include/generated")
 
-
-if (DEFINED NO_VERSION_INFO)
 add_custom_target(
 		version-header
 	COMMAND
-		 mkdir -p ${GEN_HEADER_PATH} && bash "${CMAKE_CURRENT_SOURCE_DIR}/gen_version_header.sh" "${GEN_HEADER_PATH}/version.h" "dummy"
+		${CMAKE_COMMAND} -D SRC=${CMAKE_SOURCE_DIR}/version.h.template
-        WORKING_DIRECTORY
+					 -D DST=${GEN_HEADER_PATH}/version.h
-                ${CMAKE_CURRENT_SOURCE_DIR}
+					 -P ${CMAKE_SOURCE_DIR}/GenerateVersion.cmake
-        COMMENT "Generating version header dummy"
-	)
-	set (NO_VERSION_INFO true)
-	message("${BoldMagenta}No Version Information will be built${ColorReset}")
-else(DEFINED NO_VERSION_INFO)
-add_custom_target(
-		version-header
-	COMMAND
-		mkdir -p ${GEN_HEADER_PATH} && bash "${CMAKE_CURRENT_SOURCE_DIR}/gen_version_header.sh" "${GEN_HEADER_PATH}/version.h"
 	WORKING_DIRECTORY
 		${CMAKE_CURRENT_SOURCE_DIR}
 	COMMENT "Generating version header"
 	)
 	add_subdirectory(man)
-endif(DEFINED NO_VERSION_INFO)
 
 add_custom_target(schema-header DEPENDS "${GEN_HEADER_PATH}/schema-blob.h")
 add_custom_command(
@@ -82,7 +70,7 @@ target_include_directories(${PROJECT_NAME} PRIVATE "include")
 add_dependencies(${PROJECT_NAME} schema-header)
 add_dependencies(${PROJECT_NAME} version-header)
 
-if (DOXYGEN_FOUND AND (NOT (DEFINED NO_VERSION_INFO)))
+if (DOXYGEN_FOUND)
 	set(DOXYFILE_SRC "${CMAKE_CURRENT_SOURCE_DIR}/doxygen/Doxyfile.in")
 	set(DOXYFILE_DEST "${CMAKE_CURRENT_BINARY_DIR}/Doxyfile")
 	configure_file(${DOXYFILE_SRC} ${DOXYFILE_DEST} @ONLY)
@@ -97,11 +85,13 @@ if (DOXYGEN_FOUND AND (NOT (DEFINED NO_VERSION_INFO)))
 
 	add_custom_target(doxygen-version-header
 		COMMAND
-			bash ${CMAKE_CURRENT_SOURCE_DIR}/doxygen/gen-version-string.sh "${CMAKE_CURRENT_BINARY_DIR}/doxyversion.in"
+			${CMAKE_COMMAND} -D SRC="${CMAKE_SOURCE_DIR}/doxyversion.in.template"
+					 -D DST="${CMAKE_CURRENT_BINARY_DIR}/doxyversion.in"
+					 -P ${CMAKE_SOURCE_DIR}/GenerateVersion.cmake
 		WORKING_DIRECTORY
 			${CMAKE_CURRENT_SOURCE_DIR}
 	)
-else  (DOXYGEN_FOUND AND (NOT (DEFINED NO_VERSION_INFO)))
+else  (DOXYGEN_FOUND)
 	message("${BoldMagenta}Doxygen needs to be installed to generate the doxygen documentation${ColorReset}")
 	message("${BoldMagenta}doxygen target will not be available${ColorReset}")
-endif  (DOXYGEN_FOUND AND (NOT (DEFINED NO_VERSION_INFO)))
+endif  (DOXYGEN_FOUND)

GenerateVersion.cmake

@@ -0,0 +1,26 @@
+find_package(Git)
+
+if(GIT_EXECUTABLE)
+  get_filename_component(WORKING_DIR ${SRC} DIRECTORY)
+  execute_process(
+    COMMAND ${GIT_EXECUTABLE} describe --always --dirty
+    WORKING_DIRECTORY ${WORKING_DIR}
+    OUTPUT_VARIABLE PROGRAM_GIT_VERSION
+    RESULT_VARIABLE ERROR_CODE
+    OUTPUT_STRIP_TRAILING_WHITESPACE
+    )
+
+  if(NOT ERROR_CODE EQUAL "0")
+    set(PROGRAM_GIT_VERSION "")
+  endif()
+
+endif()
+
+if(PROGRAM_GIT_VERSION STREQUAL "")
+  set(PROGRAM_GIT_VERSION 0.0.0-unknown)
+  message(WARNING "Failed to determine version from Git tags. Using default version \"${PROGRAM_GIT_VERSION}\".")
+else()
+message("Git Version: \"${PROGRAM_GIT_VERSION}\".")
+endif()
+
+configure_file(${SRC} ${DST} @ONLY)

doxyversion.in.template

@@ -0,0 +1 @@
+@PROGRAM_GIT_VERSION@

gen-version-string.sh

@@ -1 +0,0 @@
-echo `git describe --tags --always --dirty`

gen_version_header.sh

@@ -1,16 +0,0 @@
-#!/bin/bash
-
-if [[ -z $1 ]]; then
-	exit -1;
-fi
-
-if [[ "$2" == "dummy" ]]; then
-	ver="v0.0.0-undefined"
-else
-	ver=`git describe --tags --always --dirty`
-fi
-
-echo "#ifndef _VERSION_GENERATED_H_" > $1
-echo "#define _VERSION_GENERATED_H_" >> $1
-echo "#define GIT_VERSION_STRING \"$ver\"" >> $1
-echo "#endif /* _VERSION_GENERATED_H_ */" >> $1

version.h.template

@@ -0,0 +1,4 @@
+#ifndef _GENRATED_VERSION_H_
+#define _GENRATED_VERSION_H_
+#define GIT_VERSION_STRING "@PROGRAM_GIT_VERSION@"
+#endif /* _GENRATED_VERSION_H_ */