Skip to content

Commit 1707f20

Browse files
committed
doxygen.cmake : make build-tree location of ${PROJECT_NAME}.doxytag match the install-tree
+ simplify installation of doxytag file, simplify cleanup config
1 parent a771dc7 commit 1707f20

File tree

1 file changed

+5
-11
lines changed

1 file changed

+5
-11
lines changed

doxygen.cmake

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -514,7 +514,10 @@ macro(_SETUP_DOXYGEN_DEFAULT_OPTIONS)
514514
# ---------------------------------------------------------------------------
515515
# Configuration options related to external references
516516
# ---------------------------------------------------------------------------
517-
_set_if_undefined(DOXYGEN_GENERATE_TAGFILE "${PROJECT_NAME}.doxytag")
517+
_set_if_undefined(
518+
DOXYGEN_GENERATE_TAGFILE
519+
"doxygen-html/${PROJECT_NAME}.doxytag"
520+
)
518521
# ---------------------------------------------------------------------------
519522
# Configuration options related to the dot tool
520523
# ---------------------------------------------------------------------------
@@ -592,9 +595,7 @@ macro(_SETUP_PROJECT_DOCUMENTATION)
592595
add_dependencies(doc ${PROJECT_NAME}-doc)
593596

594597
add_custom_command(
595-
OUTPUT
596-
${PROJECT_BINARY_DIR}/doc/${PROJECT_NAME}.doxytag
597-
${PROJECT_BINARY_DIR}/doc/doxygen-html
598+
OUTPUT ${PROJECT_BINARY_DIR}/doc/doxygen-html
598599
COMMAND ${DOXYGEN_EXECUTABLE} ${JRL_CMAKEMODULE_DOXYFILE_PATH}
599600
WORKING_DIRECTORY doc
600601
COMMENT "Generating Doxygen documentation"
@@ -606,7 +607,6 @@ macro(_SETUP_PROJECT_DOCUMENTATION)
606607
APPEND
607608
PROPERTY
608609
ADDITIONAL_MAKE_CLEAN_FILES
609-
${PROJECT_BINARY_DIR}/doc/${PROJECT_NAME}.doxytag
610610
${PROJECT_BINARY_DIR}/doc/doxygen.log
611611
${PROJECT_BINARY_DIR}/doc/doxygen-html
612612
)
@@ -639,12 +639,6 @@ macro(_SETUP_PROJECT_DOCUMENTATION)
639639

640640
# Install generated files.
641641
if(INSTALL_DOCUMENTATION)
642-
if(EXISTS ${PROJECT_BINARY_DIR}/doc/${PROJECT_NAME}.doxytag)
643-
install(
644-
FILES ${PROJECT_BINARY_DIR}/doc/${PROJECT_NAME}.doxytag
645-
DESTINATION ${CMAKE_INSTALL_FULL_DOCDIR}/doxygen-html
646-
)
647-
endif()
648642
install(
649643
DIRECTORY ${PROJECT_BINARY_DIR}/doc/doxygen-html
650644
DESTINATION ${CMAKE_INSTALL_FULL_DOCDIR}

0 commit comments

Comments
 (0)