From 119667d886c111b6feab703953624d56c756fdd6 Mon Sep 17 00:00:00 2001 From: Guy Harris Date: Thu, 14 Oct 2021 00:30:08 -0700 Subject: [PATCH] doc: fix the macOS build. BUNDLE_RESOURCE_SHARE_MAN[14]_FILES shouold *not* have the generate_ prefixes; names with those prefixes are fake targets, not names of files that we generate, so attempting to copy files with those names fails. It should, however, have "doc/" before the names of the man pages, as they're generated into the doc directory of the top-level build directory. --- doc/CMakeLists.txt | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt index b50ca9e2f6..247da475d4 100644 --- a/doc/CMakeLists.txt +++ b/doc/CMakeLists.txt @@ -23,7 +23,9 @@ add_custom_command( set(MAN_TARGETS) set(HTML_TARGETS) set(MAN1_INSTALL_FILES) +set(GENERATED_MAN1_PAGES) set(MAN4_INSTALL_FILES) +set(GENERATED_MAN4_PAGES) macro (ASCIIDOCTOR2MANHTML _page_name _man_section) if(ASCIIDOCTOR_FOUND) @@ -35,8 +37,10 @@ macro (ASCIIDOCTOR2MANHTML _page_name _man_section) if (${_man_section} EQUAL 1) list(APPEND MAN1_INSTALL_FILES ${CMAKE_CURRENT_BINARY_DIR}/${_page_name}.${_man_section}) + list(APPEND GENERATED_MAN1_PAGES doc/${_page_name}.${_man_section}) elseif (${_man_section} EQUAL 4) list(APPEND MAN4_INSTALL_FILES ${CMAKE_CURRENT_BINARY_DIR}/${_page_name}.${_man_section}) + list(APPEND GENERATED_MAN4_PAGES doc/${_page_name}.${_man_section}) else() message(FATAL_ERROR "Unsupported manual page section ${_man_section} for ${_page_name}") endif() @@ -86,8 +90,8 @@ if (BUILD_xxx2deb) ASCIIDOCTOR2MANHTML(idl2deb 1) endif() -set(BUNDLE_RESOURCE_SHARE_MAN1_FILES ${MAN_TARGETS} PARENT_SCOPE) -set(BUNDLE_RESOURCE_SHARE_MAN4_FILES ${MAN4_INSTALL_TARGETS} PARENT_SCOPE) +set(BUNDLE_RESOURCE_SHARE_MAN1_FILES ${GENERATED_MAN1_PAGES} PARENT_SCOPE) +set(BUNDLE_RESOURCE_SHARE_MAN4_FILES ${GENERATED_MAN4_PAGES} PARENT_SCOPE) add_custom_target(manpages DEPENDS ${MAN_TARGETS}