diff options
| author | Peter Wu <peter@lekensteyn.nl> | 2017-04-24 17:48:16 +0200 |
|---|---|---|
| committer | Peter Wu <peter@lekensteyn.nl> | 2017-04-26 21:50:44 +0000 |
| commit | a8d97771610ec5f0e81f434f21002c31e83aeb5b (patch) | |
| tree | 35af516e6cc86264d2db39fbfe8b39f29dba040b /cmake | |
| parent | 821a3466c68ed509d8f71e34a62a2227823b1e55 (diff) | |
| download | wireshark-a8d97771610ec5f0e81f434f21002c31e83aeb5b.tar.gz wireshark-a8d97771610ec5f0e81f434f21002c31e83aeb5b.tar.bz2 wireshark-a8d97771610ec5f0e81f434f21002c31e83aeb5b.zip | |
cmake: remove dependency on sed
runlex.sh does not need sed anymore since v2.3.0rc0-2386-g64f83641ad.
Since building docs already depends on Perl, let's use Perl instead.
Change-Id: Id7e923e47001cfd32c8cef89960377026464f2ee
Reviewed-on: https://code.wireshark.org/review/21314
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/modules/FindSED.cmake | 25 | ||||
| -rw-r--r-- | cmake/modules/FindXSLTPROC.cmake | 6 |
2 files changed, 1 insertions, 30 deletions
diff --git a/cmake/modules/FindSED.cmake b/cmake/modules/FindSED.cmake deleted file mode 100644 index d0d7c79a98..0000000000 --- a/cmake/modules/FindSED.cmake +++ /dev/null @@ -1,25 +0,0 @@ -# -# - Find unix commands from cygwin -# This module looks for some usual Unix commands. -# - -INCLUDE(FindCygwin) - -FIND_PROGRAM(SED_EXECUTABLE - NAMES - sed - PATHS - ${CYGWIN_INSTALL_PATH}/bin - /bin - /usr/bin - /usr/local/bin - /sbin -) - -# handle the QUIETLY and REQUIRED arguments and set SED_FOUND to TRUE if -# all listed variables are TRUE -INCLUDE(FindPackageHandleStandardArgs) -FIND_PACKAGE_HANDLE_STANDARD_ARGS(SED DEFAULT_MSG SED_EXECUTABLE) - -MARK_AS_ADVANCED(SED_EXECUTABLE) - diff --git a/cmake/modules/FindXSLTPROC.cmake b/cmake/modules/FindXSLTPROC.cmake index 4bfd560eeb..37919d2310 100644 --- a/cmake/modules/FindXSLTPROC.cmake +++ b/cmake/modules/FindXSLTPROC.cmake @@ -12,10 +12,6 @@ if(ENABLE_PDF_GUIDES) endif() endif() -if(ENABLE_CHM_GUIDES) - find_package(SED) -endif() - find_program(XSLTPROC_EXECUTABLE NAMES xsltproc @@ -234,7 +230,7 @@ MACRO(XML2HHP _target_dep _guide _dbk_source) COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_CURRENT_SOURCE_DIR}/${_gfxdir} ${_basedir}/${_gfxdir} COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_CURRENT_SOURCE_DIR}/common_graphics ${_basedir}/${_gfxdir} # HTML Help doesn't render decimal character entities in the title. - COMMAND ${SED_EXECUTABLE} + COMMAND ${PERL_EXECUTABLE} -p -e "s|er’s Guide</title>|er's Guide</title>|" < ${_dbk_source} > ${_docbook_plain_title} |