Skip to content

Commit 26f9de7

Browse files
authored
Merge pull request #6159 from vmihalko/fix-cmake-doc-build
Fix CMake doc target
2 parents 9936169 + 35a5f17 commit 26f9de7

File tree

2 files changed

+5
-15
lines changed

2 files changed

+5
-15
lines changed

src/CMakeLists.txt

Lines changed: 4 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -5,26 +5,16 @@ find_package(FLEX REQUIRED)
55

66
find_package(Doxygen)
77
if(DOXYGEN_FOUND)
8-
set(ROOT_BINARY_DIR "${CMAKE_CURRENT_BINARY_DIR}/..")
9-
set(ROOT_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/..")
10-
set(ORIGINAL_DOXYFILE "${CMAKE_CURRENT_SOURCE_DIR}/doxyfile")
11-
set(CONFIGURED_DOXYFILE "${ROOT_BINARY_DIR}/doxyfile")
12-
set(DOC_INPUT_DIRECTORY "${ROOT_SOURCE_DIR}/doc")
13-
set(DOC_OUTPUT_DIRECTORY "${ROOT_BINARY_DIR}/doc")
8+
set(CONFIGURED_DOXYFILE "${CMAKE_BINARY_DIR}/doxyfile")
9+
set(DOC_INPUT_DIRECTORY "${CMAKE_SOURCE_DIR}/doc")
10+
set(DOC_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/doc")
1411

15-
configure_file("${CMAKE_CURRENT_SOURCE_DIR}/doxyfile.override.in" "${CONFIGURED_DOXYFILE}")
12+
configure_file("${CMAKE_CURRENT_SOURCE_DIR}/doxyfile.override.in" "${CONFIGURED_DOXYFILE}" @ONLY)
1613
add_custom_target(doc
1714
COMMAND "${CMAKE_COMMAND}" -E remove_directory "${DOC_OUTPUT_DIRECTORY}"
1815
COMMAND "${CMAKE_COMMAND}" -E copy_directory "${DOC_INPUT_DIRECTORY}" "${DOC_OUTPUT_DIRECTORY}"
1916
COMMAND "${DOXYGEN_EXECUTABLE}" "${CONFIGURED_DOXYFILE}"
2017
WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}")
21-
22-
unset(DOC_OUTPUT_DIRECTORY)
23-
unset(DOC_INPUT_DIRECTORY)
24-
unset(CONFIGURED_DOXYFILE)
25-
unset(ORIGINAL_DOXYFILE)
26-
unset(ROOT_SOURCE_DIR)
27-
unset(ROOT_BINARY_DIR)
2818
endif(DOXYGEN_FOUND)
2919

3020
# Add a bison target named 'parser'.

src/doxyfile.override.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,6 @@
77
# configure_file; variables like @this@ are replaced by
88
# cmake variables.
99

10-
@INCLUDE = @ORIGINAL_DOXYFILE@
10+
@INCLUDE = @CMAKE_SOURCE_DIR@/src/doxyfile
1111

1212
OUTPUT_DIRECTORY = @DOC_OUTPUT_DIRECTORY@

0 commit comments

Comments
 (0)