w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2024-11-22 04:11:16 -05:00
Code Issues Packages Projects Releases Wiki Activity

Make CMake variable for asciidoc script less likely to be overridden

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@5327 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
Bill Somerville 2015-04-29 23:56:48 +00:00
parent 2f8b3abb81
commit ec0c0786a9
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
doc/CMakeLists.txt
View File

@ -107,10 +107,10 @@ you can also skip building the documentation by switching the option
WSJT_GENERATE_DOCS to OFF.") WSJT_GENERATE_DOCS to OFF.")
endif (PYTHON_VERSION_STRING VERSION_GREATER 2.9.9) endif (PYTHON_VERSION_STRING VERSION_GREATER 2.9.9)
find_program (ASCIIDOC NAMES asciidoc asciidoc.py) find_program (ASCIIDOC_EXECUTABLE NAMES asciidoc asciidoc.py)
if (NOT ASCIIDOC) if (NOT ASCIIDOC_EXECUTABLE)
message (FATAL_ERROR "Asciidoc is required to build the documentation") message (FATAL_ERROR "Asciidoc is required to build the documentation")
endif (NOT ASCIIDOC) endif (NOT ASCIIDOC_EXECUTABLE)
include (CMakeParseArguments) include (CMakeParseArguments)
@ -128,7 +128,7 @@ function (html_document)
add_custom_command ( add_custom_command (
OUTPUT ${_doc_file} OUTPUT ${_doc_file}
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/${path} 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} DEPENDS ${args_DEPENDS}
COMMENT "Generating ${_doc_file}" COMMENT "Generating ${_doc_file}"
) )