Merge branch 'feature/bug_gitversion' of https://github.com/albert-github/doxygen into albert-github-feature/bug_gitversion

6 files changed, 13 insertions, 30 deletions

diff --git a/addon/doxyapp/CMakeLists.txt b/addon/doxyapp/CMakeLists.txt
index 3312f1a..f205664 100644
--- a/addon/doxyapp/CMakeLists.txt
+++ b/addon/doxyapp/CMakeLists.txt
@@ -2,6 +2,7 @@ find_package(Iconv)
 
 include_directories(
 	${CMAKE_SOURCE_DIR}/src
+	${CMAKE_SOURCE_DIR}/libversion
 	${GENERATED_SRC}
 	${CMAKE_SOURCE_DIR}/qtools
 	${ICONV_INCLUDE_DIR}
@@ -22,6 +23,7 @@ qtools
 md5
 lodepng
 mscgen
+version
 doxycfg
 vhdlparser
 ${ICONV_LIBRARIES}
diff --git a/addon/doxyparse/CMakeLists.txt b/addon/doxyparse/CMakeLists.txt
index 7741dab..e76f031 100644
--- a/addon/doxyparse/CMakeLists.txt
+++ b/addon/doxyparse/CMakeLists.txt
@@ -2,6 +2,7 @@ find_package(Iconv)
 
 include_directories(
 	${CMAKE_SOURCE_DIR}/src
+	${CMAKE_SOURCE_DIR}/libversion
 	${GENERATED_SRC}
 	${CMAKE_SOURCE_DIR}/qtools
 	${ICONV_INCLUDE_DIR}
@@ -22,6 +23,7 @@ qtools
 md5
 lodepng
 mscgen
+version
 doxycfg
 vhdlparser
 ${ICONV_LIBRARIES}
diff --git a/addon/doxywizard/CMakeLists.txt b/addon/doxywizard/CMakeLists.txt
index a89864d..9aba4e4 100644
--- a/addon/doxywizard/CMakeLists.txt
+++ b/addon/doxywizard/CMakeLists.txt
@@ -30,6 +30,7 @@ endif()
 
 include_directories(
 	.
+        ${CMAKE_SOURCE_DIR}/libversion
 	${CMAKE_SOURCE_DIR}/src
 	${CMAKE_SOURCE_DIR}/qtools
 	${GENERATED_SRC}
@@ -57,8 +58,10 @@ CONTENT "#ifndef SETTINGS_H
 set_source_files_properties(${GENERATED_SRC_WIZARD}/settings.h PROPERTIES GENERATED 1)
 
 # generate version.cpp
-file(GENERATE OUTPUT ${GENERATED_SRC_WIZARD}/version.cpp
-    CONTENT "char versionString[]=\"${VERSION}\";"
+add_custom_command(
+    COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/src/version.py ${VERSION} > ${GENERATED_SRC_WIZARD}/version.cpp
+    DEPENDS ${CMAKE_SOURCE_DIR}/VERSION ${CMAKE_SOURCE_DIR}/src/version.py
+    OUTPUT ${GENERATED_SRC_WIZARD}/version.cpp
 )
 set_source_files_properties(${GENERATED_SRC_WIZARD}/version.cpp PROPERTIES GENERATED 1)
 
@@ -93,7 +96,6 @@ inputstring.cpp
 inputint.cpp
 inputstrlist.cpp
 ${GENERATED_SRC_WIZARD}/settings.h
-${GENERATED_SRC_WIZARD}/version.cpp
 ${GENERATED_SRC_WIZARD}/config_doxyw.cpp
 ${GENERATED_SRC_WIZARD}/configdoc.cpp
 ${doxywizard_MOC}
@@ -102,9 +104,9 @@ doxywizard.rc
 )
 
 if(Qt5Core_FOUND)
-  target_link_libraries(doxywizard Qt5::Core Qt5::Gui Qt5::Widgets Qt5::Xml)
+  target_link_libraries(doxywizard Qt5::Core Qt5::Gui Qt5::Widgets Qt5::Xml version)
 else()
-  target_link_libraries(doxywizard ${QT_LIBRARIES} ${QT_QTMAIN_LIBRARY})
+  target_link_libraries(doxywizard ${QT_LIBRARIES} ${QT_QTMAIN_LIBRARY} version)
 endif()
 
 install(TARGETS doxywizard DESTINATION bin)
diff --git a/addon/doxywizard/doxywizard.cpp b/addon/doxywizard/doxywizard.cpp
index 56378ed..02e8cd0 100755
--- a/addon/doxywizard/doxywizard.cpp
+++ b/addon/doxywizard/doxywizard.cpp
@@ -216,7 +216,7 @@ void MainWindow::about()
   QString msg;
   QTextStream t(&msg,QIODevice::WriteOnly);
   t << QString::fromLatin1("<qt><center>A tool to configure and run doxygen version ")+
-       QString::fromLatin1(versionString)+
+       QString::fromLatin1(getVersion())+
        QString::fromLatin1(" on your source files.</center><p><br>"
        "<center>Written by<br> Dimitri van Heesch<br>&copy; 2000-2015</center><p>"
        "</qt>");
diff --git a/addon/doxywizard/expert.cpp b/addon/doxywizard/expert.cpp
index 44dea78..c875d8d 100644
--- a/addon/doxywizard/expert.cpp
+++ b/addon/doxywizard/expert.cpp
@@ -781,7 +781,7 @@ void Expert::saveTopic(QTextStream &t,QDomElement &elem,QTextCodec *codec,
 bool Expert::writeConfig(QTextStream &t,bool brief)
 {
   // write global header
-  t << "# Doxyfile " << versionString << endl << endl; 
+  t << "# Doxyfile " << getVersion() << endl << endl;
   if (!brief)
   {
     t << convertToComment(m_header);
diff --git a/addon/doxywizard/version.h b/addon/doxywizard/version.h
deleted file mode 100644
index 16bf9df..0000000
--- a/addon/doxywizard/version.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/******************************************************************************
- *
- * 
- *
- * Copyright (C) 1997-2015 by Dimitri van Heesch.
- *
- * Permission to use, copy, modify, and distribute this software and its
- * documentation under the terms of the GNU General Public License is hereby 
- * granted. No representations are made about the suitability of this software 
- * for any purpose. It is provided "as is" without express or implied warranty.
- * See the GNU General Public License for more details.
- *
- * Documents produced by Doxygen are derivative works derived from the
- * input used in their production; they are not affected by this license.
- *
- */
-
-#ifndef VERSION_H
-#define VERSION_H
-
-extern char versionString[];
-
-#endif