osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

CMake: Detection of HTMHelp 

CMake erroneously reports that HTMLHelp wasn't found

The override of FindHTMLHelp.cmake now uses
FIND_PACKAGE_HANDLE_STANDARD_ARGS to do this correctly.

Change-Id: I1bd24964365dea00af213092872e24cbfb5ee07d
Reviewed-on: https://code.wireshark.org/review/24281
Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
Petri-Dish: Graham Bloice <graham.bloice@trihedral.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
This commit is contained in:
Graham Bloice 2017-11-07 16:15:01 +00:00 committed by Michael Mann
parent 0c1ea1cee1
commit b6d6eb9097
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
cmake/modules/FindHTMLHelp.cmake
View File

@ -42,6 +42,13 @@ if(WIN32)
PATH_SUFFIXES "HTML Help Workshop/lib"
)
# handle the QUIETLY and REQUIRED arguments and set HTMLHelp_FOUND to TRUE if
# all listed variables are TRUE
INCLUDE(FindPackageHandleStandardArgs)
FIND_PACKAGE_HANDLE_STANDARD_ARGS(HTMLHelp
REQUIRED_VARS HTML_HELP_COMPILER HTML_HELP_INCLUDE_PATH HTML_HELP_LIBRARY
)
mark_as_advanced(
HTML_HELP_COMPILER
HTML_HELP_INCLUDE_PATH