diff options
| author | Gerald Combs <gerald@wireshark.org> | 2021-10-14 10:00:23 -0700 |
|---|---|---|
| committer | Wireshark GitLab Utility <gerald+gitlab-utility@wireshark.org> | 2021-10-14 19:34:18 +0000 |
| commit | 46f27973cacbe3fabb8fe7bd6c18aafaa6dc629b (patch) | |
| tree | df16daa293bbced2396d406e52cb22836c67ca9b | |
| parent | 0d3bfedfb0fa3afd3d7787873823b80796097003 (diff) | |
CMake: Partially revert recent docs changes.
Revert recent "docs" target changes. It made that target build faster,
but broke other dependencies. Keep the AsciidoctorJ changes.
Revert "doc: fix the macOS build."
This reverts commit 119667d886c111b6feab703953624d56c756fdd6.
Revert "CMake: Try to make our man page builds faster."
This reverts commit 74747c4d2ffef25c20d950525aa316bb5e2a0700.
| -rw-r--r-- | doc/CMakeLists.txt | 24 |
1 files changed, 9 insertions, 15 deletions
diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt index 247da475d4..a1e74b5fbc 100644 --- a/doc/CMakeLists.txt +++ b/doc/CMakeLists.txt @@ -20,27 +20,20 @@ add_custom_command( ${CMAKE_SOURCE_DIR}/AUTHORS ) -set(MAN_TARGETS) -set(HTML_TARGETS) set(MAN1_INSTALL_FILES) -set(GENERATED_MAN1_PAGES) set(MAN4_INSTALL_FILES) -set(GENERATED_MAN4_PAGES) +set(HTML_INSTALL_FILES) macro (ASCIIDOCTOR2MANHTML _page_name _man_section) if(ASCIIDOCTOR_FOUND) ASCIIDOCTOR2HTML(${_page_name}.adoc) ASCIIDOCTOR2MAN(${_page_name}.adoc ${_man_section}) - list(APPEND HTML_TARGETS generate_${_page_name}.html) - list(APPEND MAN_TARGETS generate_${_page_name}.${_man_section}) - + list(APPEND HTML_INSTALL_FILES ${CMAKE_CURRENT_BINARY_DIR}/${_page_name}.html) 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() @@ -90,20 +83,21 @@ if (BUILD_xxx2deb) ASCIIDOCTOR2MANHTML(idl2deb 1) endif() -set(BUNDLE_RESOURCE_SHARE_MAN1_FILES ${GENERATED_MAN1_PAGES} PARENT_SCOPE) -set(BUNDLE_RESOURCE_SHARE_MAN4_FILES ${GENERATED_MAN4_PAGES} PARENT_SCOPE) +set(BUNDLE_RESOURCE_SHARE_MAN1_FILES ${MAN1_INSTALL_FILES} PARENT_SCOPE) +set(BUNDLE_RESOURCE_SHARE_MAN4_FILES ${MAN4_INSTALL_FILES} PARENT_SCOPE) add_custom_target(manpages DEPENDS - ${MAN_TARGETS} - ${MAN4_INSTALL_TARGETS} + ${MAN1_INSTALL_FILES} + ${MAN4_INSTALL_FILES} ) add_custom_target( docs ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/AUTHORS-SHORT - ${MAN_TARGETS} - ${HTML_TARGETS} + ${MAN1_INSTALL_FILES} + ${MAN4_INSTALL_FILES} + ${HTML_INSTALL_FILES} ) set_target_properties(docs PROPERTIES FOLDER "Docs") |