From 3cf3c0215e776217a5ca0969462905ca22eba831 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?P=C5=99emysl=20Eric=20Janouch?= Date: Wed, 24 Aug 2022 01:09:02 +0200 Subject: [PATCH] Build with AsciiDoc as well as Asciidoctor --- CMakeLists.txt | 29 ++++++++++++++++++++--------- README.adoc | 2 +- 2 files changed, 21 insertions(+), 10 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index bfc7ed4..98a5291 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -97,20 +97,31 @@ install (FILES LICENSE DESTINATION ${CMAKE_INSTALL_DOCDIR}) # Generate documentation from text markup find_program (ASCIIDOCTOR_EXECUTABLE asciidoctor) -if (NOT ASCIIDOCTOR_EXECUTABLE) - message (FATAL_ERROR "asciidoctor not found") +find_program (A2X_EXECUTABLE a2x) +if (NOT ASCIIDOCTOR_EXECUTABLE AND NOT A2X_EXECUTABLE) + message (FATAL_ERROR "Neither asciidoctor nor a2x were found") endif () foreach (page ${PROJECT_NAME}) set (page_output "${PROJECT_BINARY_DIR}/${page}.1") list (APPEND project_MAN_PAGES "${page_output}") - add_custom_command (OUTPUT ${page_output} - COMMAND ${ASCIIDOCTOR_EXECUTABLE} -b manpage - -a release-version=${PROJECT_VERSION} - "${PROJECT_SOURCE_DIR}/${page}.adoc" - -o "${page_output}" - DEPENDS ${page}.adoc - COMMENT "Generating man page for ${page}" VERBATIM) + if (ASCIIDOCTOR_EXECUTABLE) + add_custom_command (OUTPUT ${page_output} + COMMAND ${ASCIIDOCTOR_EXECUTABLE} -b manpage + -a release-version=${PROJECT_VERSION} + -o "${page_output}" + "${PROJECT_SOURCE_DIR}/${page}.adoc" + DEPENDS ${page}.adoc + COMMENT "Generating man page for ${page}" VERBATIM) + elseif (A2X_EXECUTABLE) + add_custom_command (OUTPUT ${page_output} + COMMAND ${A2X_EXECUTABLE} --doctype manpage --format manpage + -a release-version=${PROJECT_VERSION} + -D "${PROJECT_BINARY_DIR}" + "${PROJECT_SOURCE_DIR}/${page}.adoc" + DEPENDS ${page}.adoc + COMMENT "Generating man page for ${page}" VERBATIM) + endif () endforeach () add_custom_target (docs ALL DEPENDS ${project_MAN_PAGES}) diff --git a/README.adoc b/README.adoc index be42b73..35412b4 100644 --- a/README.adoc +++ b/README.adoc @@ -34,7 +34,7 @@ a package with the latest development version from Archlinux's AUR. Building -------- -Build dependencies: CMake, pkg-config, asciidoctor, +Build dependencies: CMake, pkg-config, asciidoctor or asciidoc, liberty (included), http-parser (included) + Runtime dependencies: libev, Jansson, cURL, openssl, readline or libedit >= 2013-07-12,