Merge branch 'fix_doxygen' into 'master'

Fix doxygen See merge request !16

Merge branch 'fix_doxygen' into 'master'
Fix doxygen See merge request !16
832fcfdb · Jan Möbius · ae2a9f95 · 97dbc727 · 832fcfdb · 832fcfdb
Commit 832fcfdb authored Jan 11, 2017 by Jan Möbius
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 1621 additions and 922 deletions

.gitlab-ci.yml .gitlab-ci.yml +9 -0

CI/ci-doc.sh CI/ci-doc.sh +15 -0

documentation/doxy.config.in documentation/doxy.config.in +1597 -922

No files found.
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -68,3 +68,12 @@ VS2013-32-bit:
  script: "CI\\Windows.bat"
  tags:
    - VS2013
+
+doc:
+  script: "CI/ci-doc.sh"
+  tags:
+    - Linux
+  artifacts:
+      paths:
+        - build-release/Build/share/OpenVolumeMesh/Doc/html
+
--- a/CI/ci-doc.sh
+++ b/CI/ci-doc.sh
+#!/bin/bash
+
+#########################################
+
+# Make release build folder
+if [ ! -d build-release ]; then
+  mkdir build-release
+fi
+
+cd build-release
+
+cmake -DCMAKE_BUILD_TYPE=Release ../
+
+#build it
+make doc
--- a/documentation/doxy.config.in
+++ b/documentation/doxy.config.in