diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3aa7a11..bf14e05 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -70,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)
@@ -85,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)
diff --git a/doxyversion.in.template b/doxyversion.in.template
new file mode 100644
index 0000000..0fabb5d
--- /dev/null
+++ b/doxyversion.in.template
@@ -0,0 +1 @@
+@PROGRAM_GIT_VERSION@
diff --git a/gen-version-string.sh b/gen-version-string.sh
deleted file mode 100755
index 6ea6ea3..0000000
--- a/gen-version-string.sh
+++ /dev/null
@@ -1 +0,0 @@
-echo `git describe --tags --always --dirty`
diff --git a/gen_version_header.sh b/gen_version_header.sh
deleted file mode 100755
index ca153b1..0000000
--- a/gen_version_header.sh
+++ /dev/null
@@ -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