diff options
| author | Gerald Combs <gerald@wireshark.org> | 2018-05-22 15:34:38 -0700 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2018-05-23 13:24:12 +0000 |
| commit | a8b6c6fbcc0737d298744bbc266e758703ca929c (patch) | |
| tree | cb2fea30d251b5970f891d86b1d378f865bd9f68 /cmake/modules/FindAsciidoctor.cmake | |
| parent | 603fe4c7ad9c3bd39975afb8cc836cf1942b659f (diff) | |
Don't look for Asciidoctor PDF unless we find Asciidoctor.
Fix a doc string while we're here.
Change-Id: Ic67e40dc7e8d624a00b97fe40fe162e6f8633cfc
Reviewed-on: https://code.wireshark.org/review/27728
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'cmake/modules/FindAsciidoctor.cmake')
| -rw-r--r-- | cmake/modules/FindAsciidoctor.cmake | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/cmake/modules/FindAsciidoctor.cmake b/cmake/modules/FindAsciidoctor.cmake index cdbb351311..60f042236e 100644 --- a/cmake/modules/FindAsciidoctor.cmake +++ b/cmake/modules/FindAsciidoctor.cmake @@ -19,18 +19,6 @@ FIND_PROGRAM(ASCIIDOCTOR_EXECUTABLE DOC "Path to Asciidoctor or AsciidoctorJ" ) -FIND_PROGRAM(ASCIIDOCTOR_PDF_EXECUTABLE - NAMES - asciidoctorj - asciidoctor-pdf - PATHS - /bin - /usr/bin - /usr/local/bin - ${CHOCOLATEY_BIN_PATH} - DOC "Path to Asciidoctor or AsciidoctorJ" -) - if(ASCIIDOCTOR_EXECUTABLE) # The AsciidctorJ wrapper script sets -Xmx256m. This isn't enough # for the User's Guide. @@ -124,6 +112,18 @@ if(ASCIIDOCTOR_EXECUTABLE) # news: release-notes.txt # ${CMAKE_COMMAND} -E copy_if_different release-notes.txt ../NEWS + FIND_PROGRAM(ASCIIDOCTOR_PDF_EXECUTABLE + NAMES + asciidoctorj + asciidoctor-pdf + PATHS + /bin + /usr/bin + /usr/local/bin + ${CHOCOLATEY_BIN_PATH} + DOC "Path to Asciidoctor PDF or AsciidoctorJ" + ) + if(ASCIIDOCTOR_PDF_EXECUTABLE) set(_asciidoctor_pdf_common_command |