From d5c1f2a73224dec0c80bdb7a4ef22862e6c55ab7 Mon Sep 17 00:00:00 2001 From: Wolfgang Bangerth Date: Fri, 10 May 2019 17:51:49 -0600 Subject: [PATCH] Run setting canonical pages as part of the doxygen generation process. This has the advantage that we need not worry about when that POST_BUILD command is run. In particular, there can not be any race conditions. This is, however, only true for the doxygen generated pages, whereas the script also touches the other .html files for which the target I put the script under has no in- or out-dependencies. --- doc/doxygen/CMakeLists.txt | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/doc/doxygen/CMakeLists.txt b/doc/doxygen/CMakeLists.txt index 285e05806f..d03d06cb86 100644 --- a/doc/doxygen/CMakeLists.txt +++ b/doc/doxygen/CMakeLists.txt @@ -284,6 +284,8 @@ ADD_CUSTOM_COMMAND( ${CMAKE_CURRENT_BINARY_DIR}/options.dox > ${CMAKE_BINARY_DIR}/doxygen.log 2>&1 # *pssst* || ${CMAKE_COMMAND} -E copy ${CMAKE_BINARY_DIR}/doxygen.log ${CMAKE_BINARY_DIR}/doxygen.err + COMMAND + ${CMAKE_CURRENT_SOURCE_DIR}/scripts/set_canonical_doxygen.py WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} DEPENDS tutorial @@ -303,10 +305,6 @@ ADD_CUSTOM_TARGET(doxygen ALL ) ADD_DEPENDENCIES(documentation doxygen) -# Set the canonical link for the doxygen webpages -ADD_CUSTOM_COMMAND(TARGET doxygen POST_BUILD - COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/scripts/set_canonical_doxygen.py) - INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/deal.tag DESTINATION ${DEAL_II_DOCHTML_RELDIR}/doxygen -- 2.39.5