Skip to content

Commit ee9e2cb

Browse files
committed
Make doxygen config work with newer cmake versions
1 parent 57819f1 commit ee9e2cb

File tree

2 files changed

+11
-7
lines changed

2 files changed

+11
-7
lines changed

.github/workflows/linux.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
run: |
2424
mkdir build
2525
cd build
26-
cmake -GNinja -C ${ILCSOFT}/ILCSoft.cmake -DCMAKE_CXX_FLAGS=" -fdiagnostics-color=always " ..
26+
cmake -GNinja -C ${ILCSOFT}/ILCSoft.cmake -DCMAKE_CXX_FLAGS=" -fdiagnostics-color=always " -DINSTALL_DOC=ON ..
2727
ninja -k0
2828
ctest --output-on-failure
2929
ninja install

doc/CMakeLists.txt

+10-6
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,15 @@ SET( DOC_BIN_DIR "${PROJECT_BINARY_DIR}/docbuild" )
1414

1515
SET( DOX_INPUT ../source )
1616

17+
FILE(GLOB DOXYGEN_SOURCES
18+
../source/include/ANN/*
19+
../source/include/mille/*
20+
../source/include/*
21+
../source/ann/*
22+
../source/src/mille/*
23+
../source/src/*
24+
)
25+
1726
# custom command to build documentation
1827
ADD_CUSTOM_COMMAND(
1928
OUTPUT "${DOC_BIN_DIR}/html/index.html"
@@ -26,12 +35,7 @@ ADD_CUSTOM_COMMAND(
2635
WORKING_DIRECTORY "${DOC_SRC_DIR}"
2736
COMMENT "Building API Documentation..."
2837
DEPENDS Doxyfile CMakeLists.txt
29-
../source/include/ANN/*
30-
../source/include/mille/*
31-
../source/include/*
32-
../source/ann/*
33-
../source/src/mille/*
34-
../source/src/*
38+
${DOXYGEN_SOURCES}
3539
)
3640

3741
ADD_CUSTOM_TARGET( doc DEPENDS "${DOC_BIN_DIR}/html/index.html" )

0 commit comments

Comments
 (0)