diff options
| author | Gerald Combs <gerald@wireshark.org> | 2018-02-14 12:01:35 -0800 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2018-02-14 20:23:43 +0000 |
| commit | bfedd74e99a04fb4ef802fb8a663e3bf76721992 (patch) | |
| tree | 687dadcc3bd964ec211ba8c23f73e1a14a485dbb /cmake | |
| parent | 7da66f8676cc663d8898b5ff9cf41cad80df4900 (diff) | |
CMake: Try to avoid Strawberry Perl's xsltproc.
Search for Chocolatey's and Cygwin's respective xsltprocs before searching
%PATH%. Strawberry Perl doesn't include DocBook, which makes it useless
as far as we're concerned.
Another approach would be to look in various locations for an XML catalog
files and set %XML_CATALOG_FILES%. However, Cygwin's /etc/xml/catalog
contains Cygwin-specific URLs, e.g. file:///etc/xml/docbook and can't
be used with a non-Cygwin xsltproc.
Change-Id: Iaebfdff922a6574581b9bd207625f03598c166e0
Reviewed-on: https://code.wireshark.org/review/25794
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/modules/FindXSLTPROC.cmake | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/cmake/modules/FindXSLTPROC.cmake b/cmake/modules/FindXSLTPROC.cmake index fb2d50a77a..a801bdb901 100644 --- a/cmake/modules/FindXSLTPROC.cmake +++ b/cmake/modules/FindXSLTPROC.cmake @@ -5,13 +5,16 @@ include(FindCygwin) +# Strawberry Perl ships with xsltproc but no DocBook XML files, which +# is detrimental to our interests. Search for the Chocolatey and Cygwin +# versions first. find_program(XSLTPROC_EXECUTABLE NAMES xsltproc - PATHS + HINTS + ${ChocolateyInstall}/bin ${CYGWIN_INSTALL_PATH}/bin - /bin - /usr/bin + PATHS /usr/local/bin /sbin ) |