From ec0c0786a937fed2910eb65904c6d38db9946c73 Mon Sep 17 00:00:00 2001 From: Bill Somerville Date: Wed, 29 Apr 2015 23:56:48 +0000 Subject: [PATCH] Make CMake variable for asciidoc script less likely to be overridden git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@5327 ab8295b8-cf94-4d9e-aec4-7959e3be5d79 --- doc/CMakeLists.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt index 45fc08a3e..8492be3c6 100644 --- a/doc/CMakeLists.txt +++ b/doc/CMakeLists.txt @@ -107,10 +107,10 @@ you can also skip building the documentation by switching the option WSJT_GENERATE_DOCS to OFF.") endif (PYTHON_VERSION_STRING VERSION_GREATER 2.9.9) -find_program (ASCIIDOC NAMES asciidoc asciidoc.py) -if (NOT ASCIIDOC) +find_program (ASCIIDOC_EXECUTABLE NAMES asciidoc asciidoc.py) +if (NOT ASCIIDOC_EXECUTABLE) message (FATAL_ERROR "Asciidoc is required to build the documentation") -endif (NOT ASCIIDOC) +endif (NOT ASCIIDOC_EXECUTABLE) include (CMakeParseArguments) @@ -128,7 +128,7 @@ function (html_document) add_custom_command ( OUTPUT ${_doc_file} WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/${path} - COMMAND ${PYTHON_EXECUTABLE} ARGS ${ASCIIDOC} ${args_ASCIIDOC_OPTIONS} --out-file=${CMAKE_CURRENT_BINARY_DIR}/${_output_name_we}.html ${args_SOURCE} + COMMAND ${PYTHON_EXECUTABLE} ARGS ${ASCIIDOC_EXECUTABLE} ${args_ASCIIDOC_OPTIONS} --out-file=${CMAKE_CURRENT_BINARY_DIR}/${_output_name_we}.html ${args_SOURCE} DEPENDS ${args_DEPENDS} COMMENT "Generating ${_doc_file}" )