diff options
| author | Gerald Combs <gerald@zing.org> | 2015-01-10 18:02:07 -0800 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2015-01-11 17:44:17 +0000 |
| commit | ae2888aeb2b418c9f627b553d0022b5250ca16d2 (patch) | |
| tree | 66a4f9978cac9585d6ce9878b9a3698d64e1833c | |
| parent | 9b9a06c3cb073382f91a0739e286844135775228 (diff) | |
CMake: Try to fix Cygwin a2x discovery.
Change-Id: I46ddd10ab533ff7114aa6a4241a9a261da19329c
Reviewed-on: https://code.wireshark.org/review/6487
Petri-Dish: Graham Bloice <graham.bloice@trihedral.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
| -rw-r--r-- | cmake/modules/FindASCIIDOC.cmake | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/cmake/modules/FindASCIIDOC.cmake b/cmake/modules/FindASCIIDOC.cmake index bf613d3e8e..b0a2197933 100644 --- a/cmake/modules/FindASCIIDOC.cmake +++ b/cmake/modules/FindASCIIDOC.cmake @@ -16,7 +16,11 @@ FIND_PROGRAM(A2X_EXECUTABLE /sbin ) -if (WIN32 AND NOT "${CYGWIN_INSTALL_PATH}" STREQUAL "" AND ${A2X_EXECUTABLE} MATCHES "${CYGWIN_INSTALL_PATH}") +string( TOLOWER "${CYGWIN_INSTALL_PATH}" l_cyg_path) +string( TOLOWER "${A2X_EXECUTABLE}" l_a2x_ex) +if (NOT "${CYGWIN_INSTALL_PATH}" STREQUAL "" AND "${l_a2x_ex}" MATCHES "${l_cyg_path}") + message("-- Using Cygwin a2x") + # We have most likely found a symlink to a2x.py. This won't work from the Windows shell. FIND_PROGRAM(CYGPATH_EXECUTABLE NAMES cygpath PATHS ${CYGWIN_INSTALL_PATH}/bin @@ -40,10 +44,10 @@ if (WIN32 AND NOT "${CYGWIN_INSTALL_PATH}" STREQUAL "" AND ${A2X_EXECUTABLE} MAT # - /usr/bin/a2x, which is a symlink to /usr/bin/a2x.py. # - We need to set environment variables (LC_ALL, PATH, TZ, PYTHONHOME) # so we use a wrapper script. - set( A2X_EXECUTABLE ${SH_EXECUTABLE} ${RUNA2X_CYGWIN_PATH} ) + set( RUNA2X ${SH_EXECUTABLE} ${RUNA2X_CYGWIN_PATH} ) else() # Make sure we don't get language specific quotes - set( A2X_EXECUTABLE LC_ALL=C TZ=UTC ${A2X_EXECUTABLE} ) + set( RUNA2X LC_ALL=C TZ=UTC ${A2X_EXECUTABLE} ) MACRO( TO_A2X_COMPATIBLE_PATH _cmake_path _result ) set( ${_result} ${_cmake_path} ) @@ -53,9 +57,9 @@ endif() # Handle the QUIETLY and REQUIRED arguments and set ASCIIDOC_FOUND to TRUE if # all listed variables are TRUE INCLUDE(FindPackageHandleStandardArgs) -FIND_PACKAGE_HANDLE_STANDARD_ARGS(ASCIIDOC DEFAULT_MSG A2X_EXECUTABLE) +FIND_PACKAGE_HANDLE_STANDARD_ARGS(A2X DEFAULT_MSG RUNA2X) -MARK_AS_ADVANCED(A2X_EXECUTABLE) +MARK_AS_ADVANCED(RUNA2X) TO_A2X_COMPATIBLE_PATH( ${CMAKE_CURRENT_BINARY_DIR} _a2x_current_binary_dir ) @@ -82,7 +86,7 @@ MACRO( ASCIIDOC2DOCBOOK _asciidocsource _conf_files ) ${_output_xml} # XXX - Output to a specific directory, e.g. wsdg_generated_src WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} - COMMAND ${A2X_EXECUTABLE} + COMMAND ${RUNA2X} --verbose --attribute=build_dir=${_a2x_current_binary_dir} --attribute=docinfo @@ -123,7 +127,7 @@ MACRO( ASCIIDOC2HTML _output _asciidocsource _conf_files ) OUTPUT ${_output} WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} - COMMAND ${A2X_EXECUTABLE} + COMMAND ${RUNA2X} --format=xhtml --destination-dir=${_a2x_current_binary_dir} --asciidoc-opts=${_conf_opts} @@ -169,7 +173,7 @@ MACRO( ASCIIDOC2TXT _output _asciidocsource _conf_files ) OUTPUT ${_output} WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} - COMMAND ${A2X_EXECUTABLE} + COMMAND ${RUNA2X} --format=text --destination-dir=${_a2x_current_binary_dir} --asciidoc-opts=${_conf_opts} @@ -214,7 +218,7 @@ MACRO( ASCIIDOC2PDF _output _asciidocsource _conf_files _paper ) OUTPUT ${_output} WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} - COMMAND ${A2X_EXECUTABLE} + COMMAND ${RUNA2X} --format=pdf --destination-dir=${_a2x_current_binary_dir} --asciidoc-opts=${_conf_opts} |