diff options
| author | Graham Bloice <graham.bloice@trihedral.com> | 2015-04-26 19:11:44 +0100 |
|---|---|---|
| committer | Graham Bloice <graham.bloice@trihedral.com> | 2015-04-28 15:43:48 +0000 |
| commit | e15513be9d5a44ab3862b28092d1f32b59a3dc91 (patch) | |
| tree | 2332ee6abcb5d7aa79533f7152c16b0df2c616c4 /cmake | |
| parent | aeab984510c521fbef9346aa604ea7e2b88dd41c (diff) | |
Fix Windows asciidoc build
Replace some unixisms with CMake equivalents
Change-Id: I8dc125e830cdf7c31b13539c0a86df736097afef
Reviewed-on: https://code.wireshark.org/review/8208
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/modules/FindXMLLINT.cmake | 2 | ||||
| -rw-r--r-- | cmake/modules/FindXSLTPROC.cmake | 29 |
2 files changed, 19 insertions, 12 deletions
diff --git a/cmake/modules/FindXMLLINT.cmake b/cmake/modules/FindXMLLINT.cmake index 26a0aab496..ccc93f38bb 100644 --- a/cmake/modules/FindXMLLINT.cmake +++ b/cmake/modules/FindXMLLINT.cmake @@ -64,7 +64,7 @@ MACRO(VALIDATE_XML _validated _sources) --valid --noout ${_source} - COMMAND touch + COMMAND ${CMAKE_COMMAND} -E touch ${_validated} DEPENDS ${${_sources}} diff --git a/cmake/modules/FindXSLTPROC.cmake b/cmake/modules/FindXSLTPROC.cmake index 547cf3b435..8a7ac7a15b 100644 --- a/cmake/modules/FindXSLTPROC.cmake +++ b/cmake/modules/FindXSLTPROC.cmake @@ -106,17 +106,17 @@ MACRO(XML2HTML _guide _mode _xmlsources _gfxsources) ADD_CUSTOM_COMMAND( OUTPUT ${_output} - COMMAND cmake + COMMAND ${CMAKE_COMMAND} -E make_directory ${_outdir} - COMMAND cmake + COMMAND ${CMAKE_COMMAND} -E make_directory ${_outdir}/${_gfxdir}/toolbar - COMMAND cp - ${CMAKE_CURRENT_SOURCE_DIR}/${_gfxdir}/*.* ${_outdir}/${_gfxdir}/ - COMMAND cp - ${CMAKE_CURRENT_SOURCE_DIR}/common_graphics/*.* ${_outdir}/${_gfxdir}/ - COMMAND cp - ${CMAKE_CURRENT_SOURCE_DIR}/${_gfxdir}/toolbar/*.* ${_outdir}/${_gfxdir}/toolbar/ - COMMAND cmake + COMMAND ${CMAKE_COMMAND} + -E copy_directory ${CMAKE_CURRENT_SOURCE_DIR}/${_gfxdir} ${_outdir}/${_gfxdir} + COMMAND ${CMAKE_COMMAND} + -E copy_directory ${CMAKE_CURRENT_SOURCE_DIR}/common_graphics ${_outdir}/${_gfxdir} + COMMAND ${CMAKE_COMMAND} + -E copy_directory ${CMAKE_CURRENT_SOURCE_DIR}/${_gfxdir}/toolbar ${_outdir}/${_gfxdir}/toolbar + COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/ws.css ${_outdir} COMMAND ${XSLTPROC_EXECUTABLE} --path "${_xsltproc_path}" @@ -126,13 +126,20 @@ MACRO(XML2HTML _guide _mode _xmlsources _gfxsources) ${_modeparams} ${_STYLESHEET} ${_source} - COMMAND chmod - -R og+rX ${_outdir} DEPENDS ${_validated} ${${_xmlsources}} ${${_gfxsources}} ) + IF(NOT WIN32) + ADD_CUSTOM_COMMAND( + OUTPUT + ${_output} + COMMAND chmod + -R og+rX ${_outdir} + APPEND + ) + ENDIF() ENDMACRO(XML2HTML) # Translate XML to FO to PDF |