Skip to content

Commit 2b7c5c1

Browse files
committed
Only skip *.cpp files for doc generation on travis
1 parent f8f056e commit 2b7c5c1

File tree

3 files changed

+5
-3
lines changed

3 files changed

+5
-3
lines changed

ci/travis/linux/install.sh

+3-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,9 @@ cmake -DWITH_SERVER=ON \
1515
-DENABLE_PGTEST=ON \
1616
-DWITH_QWTPOLAR=OFF \
1717
-DWITH_APIDOC=ON \
18+
-DDOXYGEN_FILE_PATTERN="*.h" \
1819
-DWITH_ASTYLE=ON \
1920
-DWITH_PYSPATIALITE=ON \
2021
-DGRASS_PREFIX7=/usr/lib/grass70 \
21-
-DGRASS_INCLUDE_DIR7=/usr/lib/grass70/include ..
22+
-DGRASS_INCLUDE_DIR7=/usr/lib/grass70/include \
23+
..

cmake_templates/Doxyfile.in

+1-2
Original file line numberDiff line numberDiff line change
@@ -622,8 +622,7 @@ INPUT_ENCODING = UTF-8
622622
# *.c *.cc *.cxx *.cpp *.c++ *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh *.hxx
623623
# *.hpp *.h++ *.idl *.odl *.cs *.php *.php3 *.inc *.m *.mm *.py *.f90
624624

625-
FILE_PATTERNS = *.h \
626-
*.dox
625+
FILE_PATTERNS = @DOXYGEN_FILE_PATTERN@
627626

628627
# The RECURSIVE tag can be used to turn specify whether or not subdirectories
629628
# should be searched for input files as well. Possible values are YES and NO.

doc/CMakeLists.txt

+1
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ IF(WITH_APIDOC)
4040
SET(DOXYGEN_TAGS ${QT_TAG_FILE}=${QT_DOC_URL})
4141
ENDIF(QT_TAG_FILE)
4242

43+
SET (DOXYGEN_FILEPATTERN "*.cpp *.h *.dox" CACHE STRING "File pattern to be parsed by doxygen.")
4344
CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/cmake_templates/Doxyfile.in ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile @ONLY)
4445
ADD_CUSTOM_TARGET(apidoc ALL
4546
COMMAND ${DOXYGEN_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile

0 commit comments

Comments
 (0)