From 6857e1ed046548373fe94cce6aa1c379dac743f3 Mon Sep 17 00:00:00 2001 From: Gerald Combs Date: Fri, 29 Jul 2022 11:35:56 -0700 Subject: [PATCH] Docs: Fix our man page dependencies. Dependencies need to be set via add_custom_command. --- cmake/modules/FindAsciidoctor.cmake | 10 ++++++++++ doc/CMakeLists.txt | 2 -- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/cmake/modules/FindAsciidoctor.cmake b/cmake/modules/FindAsciidoctor.cmake index f905aa26e0..67cbc8d8e1 100644 --- a/cmake/modules/FindAsciidoctor.cmake +++ b/cmake/modules/FindAsciidoctor.cmake @@ -75,6 +75,7 @@ if(ASCIIDOCTOR_EXECUTABLE) --out-file ${_output_xml} ${CMAKE_CURRENT_SOURCE_DIR}/${_asciidocsource} DEPENDS + ${CMAKE_SOURCE_DIR}/docbook/attributes.adoc ${CMAKE_CURRENT_SOURCE_DIR}/${_asciidocsource} ${ARGN} ) @@ -106,6 +107,7 @@ if(ASCIIDOCTOR_EXECUTABLE) --out-file ${_output_html} ${CMAKE_CURRENT_SOURCE_DIR}/${_asciidocsource} DEPENDS + ${CMAKE_SOURCE_DIR}/docbook/attributes.adoc ${CMAKE_CURRENT_SOURCE_DIR}/${_asciidocsource} ${ARGN} ) @@ -126,6 +128,8 @@ if(ASCIIDOCTOR_EXECUTABLE) ${_output_html} > ${_output_txt} DEPENDS + ${MAN_INCLUDES} + ${CMAKE_SOURCE_DIR}/docbook/attributes.adoc ${CMAKE_CURRENT_SOURCE_DIR}/${_asciidocsource} ${_output_html} ${ARGN} @@ -152,6 +156,8 @@ if(ASCIIDOCTOR_EXECUTABLE) --destination-dir ${CMAKE_CURRENT_BINARY_DIR} ${_input_adoc} DEPENDS + ${MAN_INCLUDES} + ${CMAKE_SOURCE_DIR}/docbook/attributes.adoc ${_input_adoc} ) unset(_src_file) @@ -177,6 +183,8 @@ if(ASCIIDOCTOR_EXECUTABLE) --destination-dir ${CMAKE_CURRENT_BINARY_DIR} ${_input_adoc} DEPENDS + ${MAN_INCLUDES} + ${CMAKE_SOURCE_DIR}/docbook/attributes.adoc ${_input_adoc} ) unset(_src_file) @@ -221,6 +229,7 @@ if(ASCIIDOCTOR_EXECUTABLE) --out-file "${_output_pdf}" ${CMAKE_CURRENT_SOURCE_DIR}/${_asciidocsource} DEPENDS + ${CMAKE_SOURCE_DIR}/docbook/attributes.adoc ${CMAKE_CURRENT_SOURCE_DIR}/${_asciidocsource} ${ARGN} VERBATIM @@ -271,6 +280,7 @@ if(ASCIIDOCTOR_EXECUTABLE) --out-file "${_output_epub}" ${CMAKE_CURRENT_SOURCE_DIR}/${_asciidocsource} DEPENDS + ${CMAKE_SOURCE_DIR}/docbook/attributes.adoc ${CMAKE_CURRENT_SOURCE_DIR}/${_asciidocsource} ${ARGN} VERBATIM diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt index 0626c24dcb..b08e799c80 100644 --- a/doc/CMakeLists.txt +++ b/doc/CMakeLists.txt @@ -97,7 +97,6 @@ if(ASCIIDOCTOR_FOUND) ASCIIDOCTOR2HTMLMAN(${MAN1_SOURCE_FILES} ${MAN4_SOURCE_FILES}) add_custom_target(manpages DEPENDS - ${MAN_INCLUDES} ${MAN1_INSTALL_FILES} ${MAN4_INSTALL_FILES} ) @@ -108,7 +107,6 @@ add_custom_target( docs ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/AUTHORS-SHORT - ${MAN_INCLUDES} ${MAN1_INSTALL_FILES} ${MAN4_INSTALL_FILES} ${HTML_INSTALL_FILES}