diff options
| author | Graham Bloice <graham.bloice@trihedral.com> | 2017-11-07 16:15:01 +0000 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2017-11-07 23:01:44 +0000 |
| commit | b6d6eb90970993a6342834317cb70e2519cbeff1 (patch) | |
| tree | a5534ab0fe8cb79dac30898860d6c08d93a25f8a /cmake | |
| parent | 0c1ea1cee1a3b5f3ad9e176591bbad58b2b01ad0 (diff) | |
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>
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/modules/FindHTMLHelp.cmake | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/cmake/modules/FindHTMLHelp.cmake b/cmake/modules/FindHTMLHelp.cmake index 6aab8a712b..c223d3ee9f 100644 --- a/cmake/modules/FindHTMLHelp.cmake +++ b/cmake/modules/FindHTMLHelp.cmake @@ -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 |