diff options
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | cmake/modules/FindSED.cmake | 25 | ||||
| -rw-r--r-- | cmake/modules/FindXSLTPROC.cmake | 6 |
3 files changed, 2 insertions, 31 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 586e6e12af..7334777b70 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -724,7 +724,7 @@ endif() # - set HAVE_XXX #The minimum package list -set(PACKAGELIST Gettext M Git GLIB2 GMODULE2 GTHREAD2 LEX YACC Perl SED SH PythonInterp NGHTTP2) +set(PACKAGELIST Gettext M Git GLIB2 GMODULE2 GTHREAD2 LEX YACC Perl SH PythonInterp NGHTTP2) set(LEX_REQUIRED TRUE) set(GLIB2_REQUIRED TRUE) set(GLIB2_FIND_REQUIRED TRUE) 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} |