Further cleanups related to the cmake build system

doxygen · Jun 18, 2015 · ba9bb02 · ba9bb02
1 parent f415b62
commit ba9bb02
Show file tree

Hide file tree

Showing 25 changed files with 7 additions and 10,109 deletions.
diff --git a/.gitignore b/.gitignore
@@ -11,22 +11,7 @@
 *.idb
 *.pdb
 
-
-/doc/translator_report.txt
-/doc/config.doc
-/doc/language.doc
-
 /doxygen_docs
 /doxygen.tag
 
-/examples/*/html
-/html
-/latex
-/rtf
-/xml
-/man
-/docbook
-/perlmod
-!/templates/html
-!/templates/latex
 
diff --git 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.0)
+cmake_minimum_required(VERSION 2.8.12)
 project(doxygen)
 
 option(build_wizard    "Build the GUI frontend for doxygen." OFF)

diff --git a/PLATFORMS b/PLATFORMS
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-1.8.9.1
+1.8.10
diff --git a/addon/doxyapp/doxyapp.cpp b/addon/doxyapp/doxyapp.cpp
@@ -26,7 +26,8 @@
  */
 
 #include <stdlib.h>
-#include <unistd.h>
+#include <qfile.h>
+#include <qdir.h>
 #include "doxygen.h"
 #include "outputgen.h"
 #include "parserintf.h"
@@ -308,10 +309,10 @@ int main(int argc,char **argv)
   }
 
   // remove temporary files
-  if (!Doxygen::objDBFileName.isEmpty()) unlink(Doxygen::objDBFileName);
-  if (!Doxygen::entryDBFileName.isEmpty()) unlink(Doxygen::entryDBFileName);
+  if (!Doxygen::objDBFileName.isEmpty()) QFile::remove(Doxygen::objDBFileName);
+  if (!Doxygen::entryDBFileName.isEmpty()) QFile::remove(Doxygen::entryDBFileName);
   // clean up after us
-  rmdir("/tmp/doxygen");
+  QDir().rmdir("/tmp/doxygen");
 
   while (1)
   {

diff --git a/winbuild/.gitignore b/winbuild/.gitignore
@@ -1,7 +0,0 @@
-Debug/
-Debug64/
-Release/
-Release64/
-Doxygen.ncb
-Doxygen.suo
-*.user

diff --git a/winbuild/Config.rules b/winbuild/Config.rules
diff --git a/winbuild/Doxygen.sln b/winbuild/Doxygen.sln