aboutsummaryrefslogtreecommitdiffstats
path: root/cmake
diff options
context:
space:
mode:
authorGerald Combs <gerald@wireshark.org>2021-06-22 14:42:09 -0700
committerWireshark GitLab Utility <gerald+gitlab-utility@wireshark.org>2021-06-23 05:28:55 +0000
commitcdd6f2ec801a11e045b766eead04241230f7eb41 (patch)
treeab9eb84f4ed2bb6f939df105994dfc2445dd98d3 /cmake
parent701d0565c5efe828817f37edee1fc519c702c456 (diff)
CMake+docs: Use Asciidoctor.js if it's available.
Add the executables shipped by the Asciidoctor.js project to FindAsciidoctor.cmake, and update the Developer's Guide to match.
Diffstat (limited to 'cmake')
-rw-r--r--cmake/modules/FindAsciidoctor.cmake4
1 files changed, 4 insertions, 0 deletions
diff --git a/cmake/modules/FindAsciidoctor.cmake b/cmake/modules/FindAsciidoctor.cmake
index 7afdbcc0a2..a452d4af22 100644
--- a/cmake/modules/FindAsciidoctor.cmake
+++ b/cmake/modules/FindAsciidoctor.cmake
@@ -11,6 +11,10 @@ FIND_PROGRAM(ASCIIDOCTOR_EXECUTABLE
asciidoctorj
asciidoctor
asciidoctor.ruby2.1
+ # Asciidoctor.js releases
+ asciidoctor-linux
+ asciidoctor-macos
+ asciidoctor-win
PATHS
/bin
/usr/bin