Revert 13f4081 and 2b7c5c1

Ensures that Travis is testing the same documentation coverage as the actual docs are built using.
qgis · Jan 14, 2016 · 45eeb95 · 45eeb95
1 parent d97a5e3
commit 45eeb95
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/ci/travis/linux/install.sh b/ci/travis/linux/install.sh
@@ -15,7 +15,6 @@ cmake -DWITH_SERVER=ON \
       -DENABLE_PGTEST=ON \
       -DWITH_QWTPOLAR=OFF \
       -DWITH_APIDOC=ON \
-      -DDOXYGEN_FILE_PATTERNS="*.h" \
       -DWITH_ASTYLE=ON \
       -DWITH_PYSPATIALITE=ON \
       -DGRASS_PREFIX7=/usr/lib/grass70 \

diff --git a/cmake_templates/Doxyfile.in b/cmake_templates/Doxyfile.in
@@ -622,7 +622,9 @@ INPUT_ENCODING         = UTF-8
 # *.c *.cc *.cxx *.cpp *.c++ *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh *.hxx
 # *.hpp *.h++ *.idl *.odl *.cs *.php *.php3 *.inc *.m *.mm *.py *.f90
 
-FILE_PATTERNS          = @DOXYGEN_FILE_PATTERNS@
+FILE_PATTERNS          = *.h \
+                         *.cpp \
+                         *.dox
 
 # The RECURSIVE tag can be used to turn specify whether or not subdirectories
 # should be searched for input files as well. Possible values are YES and NO.

diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
@@ -40,7 +40,6 @@ IF(WITH_APIDOC)
       SET(DOXYGEN_TAGS ${QT_TAG_FILE}=${QT_DOC_URL})
     ENDIF(QT_TAG_FILE)
 
-    SET (DOXYGEN_FILE_PATTERNS "*.cpp *.h *.dox" CACHE STRING "File patterns to be parsed by doxygen.")
     CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/cmake_templates/Doxyfile.in ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile @ONLY)
     ADD_CUSTOM_TARGET(apidoc ALL
             COMMAND ${DOXYGEN_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile

diff --git a/tests/src/python/test_qgsdoccoverage.py b/tests/src/python/test_qgsdoccoverage.py
@@ -27,7 +27,7 @@
 # DON'T RAISE THIS THRESHOLD!!!
 # (changes which lower this threshold are welcomed though!)
 
-ACCEPTABLE_MISSING_DOCS = 3754
+ACCEPTABLE_MISSING_DOCS = 3764
 
 
 class TestQgsDocCoverage(TestCase):