Merge branch 'master' of github.com:doxygen/doxygen

5 files changed, 27 insertions, 13 deletions

diff --git a/BUILD.txt b/BUILD.txt
index 48355ff..7f9efed 100644
--- a/BUILD.txt
+++ b/BUILD.txt
@@ -1,5 +1,5 @@
 Doxygen uses cmake (http://www.cmake.org/) to build executables for various platforms.
-It's required at least cmake version 3.1.3
+It's required at least cmake version 3.3.
 
 The first step is to create a build directory where the output should be stored.
 Doxygen can be fully build outside of the source tree.
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 764aebe..a9545d0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -11,7 +11,7 @@
 # Documents produced by Doxygen are derivative works derived from the
 # input used in their production; they are not affected by this license.
 
-cmake_minimum_required(VERSION 3.2)
+cmake_minimum_required(VERSION 3.3)
 project(doxygen)
 
 option(build_wizard    "Build the GUI frontend for doxygen." OFF)
diff --git a/cmake/CompilerWarnings.cmake b/cmake/CompilerWarnings.cmake
index 4c422b6..b7c6a54 100644
--- a/cmake/CompilerWarnings.cmake
+++ b/cmake/CompilerWarnings.cmake
@@ -41,14 +41,15 @@ function(set_project_warnings project_name)
       -Wextra # reasonable and standard
       -Wshadow # warn the user if a variable declaration shadows one from a
                # parent context
-      -Wnon-virtual-dtor # warn the user if a class with virtual functions has a
-                         # non-virtual destructor. This helps catch hard to
-                         # track down memory errors
+      $<$<COMPILE_LANGUAGE:CXX>:-Wnon-virtual-dtor>
+               # warn the user if a class with virtual functions has a
+               # non-virtual destructor. This helps catch hard to
+               # track down memory errors
 #      -Wold-style-cast # warn for c-style casts
       -Wcast-align # warn for potential performance problem casts
       -Wunused # warn on anything being unused
-      -Woverloaded-virtual # warn if you overload (not override) a virtual
-                           # function
+      $<$<COMPILE_LANGUAGE:CXX>:-Woverloaded-virtual>
+               # warn if you overload (not override) a virtual function
       -Wpedantic # warn if non-standard C++ is used
       -Wconversion # warn on type conversions that may lose data
       -Wnull-dereference # warn if a null dereference is detected
@@ -72,14 +73,15 @@ function(set_project_warnings project_name)
       -Wextra # reasonable and standard
       #-Wshadow # warn the user if a variable declaration shadows one from a
       #         # parent context
-      -Wnon-virtual-dtor # warn the user if a class with virtual functions has a
-                         # non-virtual destructor. This helps catch hard to
-                         # track down memory errors
+      $<$<COMPILE_LANGUAGE:CXX>:-Wnon-virtual-dtor>
+               # warn the user if a class with virtual functions has a
+               # non-virtual destructor. This helps catch hard to
+               # track down memory errors
 #      -Wold-style-cast # warn for c-style casts
       -Wcast-align # warn for potential performance problem casts
       -Wunused # warn on anything being unused
-      -Woverloaded-virtual # warn if you overload (not override) a virtual
-                           # function
+      $<$<COMPILE_LANGUAGE:CXX>:-Woverloaded-virtual>
+               # warn if you overload (not override) a virtual function
       -Wpedantic # warn if non-standard C++ is used
       #-Wconversion # warn on type conversions that may lose data
       #-Wnull-dereference # warn if a null dereference is detected
diff --git a/doc/output.doc b/doc/output.doc
index 6d1a567..77f4092 100644
--- a/doc/output.doc
+++ b/doc/output.doc
@@ -33,7 +33,7 @@ The following output formats are \e directly supported by doxygen:
 <dt><b>XML</b>
 <dd>Generated if \ref cfg_generate_xml "GENERATE_XML" is set to \c YES in the configuration file.<p>
 <dt><b>DocBook</b>
-<dd>Generated if \ref cfg_generate_docbook "GENERATE_DOCBOOOK" is set to \c YES in the configuration file.<p>
+<dd>Generated if \ref cfg_generate_docbook "GENERATE_DOCBOOK" is set to \c YES in the configuration file.<p>
 </dl>
 
 The following output formats are \e indirectly supported by doxygen:
diff --git a/src/doxygen.cpp b/src/doxygen.cpp
index 3fa6959..a0e9623 100644
--- a/src/doxygen.cpp
+++ b/src/doxygen.cpp
@@ -10772,6 +10772,18 @@ void parseInput()
 {
   atexit(exitDoxygen);
 
+  // we would like to show the versionString earlier, but we first have to handle the configuration file
+  // to know the value of the QUIET setting.
+  QCString versionString;
+  if (strlen(getGitVersion())>0)
+  {
+    versionString = QCString(getVersion())+" ("+getGitVersion()+")";
+  }
+  else
+  {
+    versionString = getVersion();
+  }
+  msg("Doxygen version used: %s\n",versionString.data());
 
   /**************************************************************************
    *            Make sure the output directory exists