diff options
| author | Peter Wu <peter@lekensteyn.nl> | 2017-03-31 18:13:01 +0200 |
|---|---|---|
| committer | Graham Bloice <graham.bloice@trihedral.com> | 2017-04-09 17:09:31 +0000 |
| commit | 1abbb503e4242f56921b7ee950f185711e9f85c0 (patch) | |
| tree | 0520f069f1d55082544d865dec58a94937a4d44f /docbook | |
| parent | 05c501373d01ae087d697940d1818cdf7acd7839 (diff) | |
| download | wireshark-1abbb503e4242f56921b7ee950f185711e9f85c0.tar.gz | |
cmake: fail if ENABLE_CHM_GUIDES but HTMLHelp is unavailable
While "cmake -DENABLE_CHM_GUIDES=ON" succeeds on Linux, the actual build
fails. Since the default for ENABLE_CHM_GUIDES is OFF, let's fail early
when ENABLE_CHM_GUIDES is requested.
When hcc.exe is found, do report the package as available.
Change-Id: If6fc3eb18f1150c251e2886f1f16277669f8ec25
Reviewed-on: https://code.wireshark.org/review/20811
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Petri-Dish: Graham Bloice <graham.bloice@trihedral.com>
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
Diffstat (limited to 'docbook')
| -rw-r--r-- | docbook/CMakeLists.txt | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/docbook/CMakeLists.txt b/docbook/CMakeLists.txt index 29c64de8cd..7bdcaa8d19 100644 --- a/docbook/CMakeLists.txt +++ b/docbook/CMakeLists.txt @@ -23,6 +23,14 @@ find_package( LYNX ) find_package( XSLTPROC ) if(ENABLE_CHM_GUIDES) find_package( HTMLHelp ) + if(HTML_HELP_COMPILER) + # We do not need the HTML Help headers and library, just the + # compiler. To avoid confusion, report the package as found. + # https://gitlab.kitware.com/cmake/cmake/issues/15886 + set(HTMLHelp_FOUND 1) + else() + message(FATAL_ERROR "HTML Help Compiler is not installed (required for ENABLE_CHM_GUIDES)") + endif() endif() find_package( ASCIIDOC ) |