Add 3d to doxygen, do not verify indentation of included poly2tri lib

qgis · Sep 15, 2017 · 9778e85159e5d0fd019429ca39407f4d7955841a · 9778e85
1 parent 3f681d1
commit 9778e85159e5d0fd019429ca39407f4d7955841a
Unified Split

Showing with 6 additions and 1 deletion.

+5 −0 doc/CMakeLists.txt

+1 −1 scripts/verify-indentation.sh
diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
@@ -53,6 +53,7 @@ IF(WITH_APIDOC)
     SET(DOXYGEN_INPUT
       ${CMAKE_SOURCE_DIR}/doc
       ${CMAKE_SOURCE_DIR}/src/core
+      ${CMAKE_SOURCE_DIR}/src/core/3d
       ${CMAKE_SOURCE_DIR}/src/core/annotations
       ${CMAKE_SOURCE_DIR}/src/core/auth
       ${CMAKE_SOURCE_DIR}/src/core/composer
@@ -91,6 +92,10 @@ IF(WITH_APIDOC)
       ${CMAKE_SOURCE_DIR}/src/analysis/openstreetmap
       ${CMAKE_SOURCE_DIR}/src/analysis/raster
       ${CMAKE_SOURCE_DIR}/src/analysis/vector
+      ${CMAKE_SOURCE_DIR}/src/3d
+      ${CMAKE_SOURCE_DIR}/src/3d/chunks
+      ${CMAKE_SOURCE_DIR}/src/3d/symbols
+      ${CMAKE_SOURCE_DIR}/src/3d/terrain
       ${CMAKE_SOURCE_DIR}/src/plugins
     )
 

diff --git a/scripts/verify-indentation.sh b/scripts/verify-indentation.sh
@@ -36,7 +36,7 @@ for f in $FILES; do
 
 	echo "Checking $f" >>/tmp/ctest-important.log
 	case "$f" in
-	src/core/gps/qextserialport/*|src/plugins/globe/osgEarthQt/*|src/plugins/globe/osgEarthUtil/*|scripts/customwidget_template*)
+	src/core/gps/qextserialport/*|src/plugins/globe/osgEarthQt/*|src/plugins/globe/osgEarthUtil/*|src/3d/poly2tri/*|scripts/customwidget_template*)
 		echo "$f skipped"
 		continue
 		;;