diff options
| author | Anders <anders.broman@ericsson.com> | 2017-06-09 16:02:21 +0200 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2017-06-10 16:11:12 +0000 |
| commit | 0dc32776d071fdf00754e349a0f9db20119df5df (patch) | |
| tree | 75d6495481c4f32182e7bd7a8219f01c3320ffad /cmake | |
| parent | 6d9172139036299482fadfd12ed43a70a184fd75 (diff) | |
| download | wireshark-0dc32776d071fdf00754e349a0f9db20119df5df.tar.gz | |
Simplify the search for HTMLHelp.
Change updated as per https://gitlab.kitware.com/cmake/cmake/issues/16950#note_277462
Change-Id: I794e6cf7af3d1affa7ee5182374b6f22d9acdf33
Reviewed-on: https://code.wireshark.org/review/22051
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/modules/FindHTMLHelp.cmake | 36 |
1 files changed, 14 insertions, 22 deletions
diff --git a/cmake/modules/FindHTMLHelp.cmake b/cmake/modules/FindHTMLHelp.cmake index 169f77fefc..6aab8a712b 100644 --- a/cmake/modules/FindHTMLHelp.cmake +++ b/cmake/modules/FindHTMLHelp.cmake @@ -15,39 +15,31 @@ # HTML_HELP_INCLUDE_PATH : include path to the API (htmlhelp.h) # HTML_HELP_LIBRARY : full path to the library (htmlhelp.lib) -set(_PF86 "PROGRAMFILES(x86)") - if(WIN32) find_program(HTML_HELP_COMPILER - hhc - "[HKEY_CURRENT_USER\\Software\\Microsoft\\HTML Help Workshop;InstallDir]" - "$ENV{ProgramFiles}/HTML Help Workshop" - "$ENV{_PF86}/HTML Help Workshop" - "C:/Program Files/HTML Help Workshop" - "C:/Program Files (x86)/HTML Help Workshop" + NAMES hhc + PATHS + "[HKEY_CURRENT_USER\\Software\\Microsoft\\HTML Help Workshop;InstallDir]" + PATH_SUFFIXES "HTML Help Workshop" ) get_filename_component(HTML_HELP_COMPILER_PATH "${HTML_HELP_COMPILER}" PATH) find_path(HTML_HELP_INCLUDE_PATH - htmlhelp.h - "${HTML_HELP_COMPILER_PATH}/include" - "[HKEY_CURRENT_USER\\Software\\Microsoft\\HTML Help Workshop;InstallDir]/include" - "$ENV{ProgramFiles}/HTML Help Workshop/include" - "$ENV{_PF86}/HTML Help Workshop/include" - "C:/Program Files/HTML Help Workshop/include" - "C:/Program Files (x86)/HTML Help Workshop/include" + NAMES htmlhelp.h + PATHS + "${HTML_HELP_COMPILER_PATH}/include" + "[HKEY_CURRENT_USER\\Software\\Microsoft\\HTML Help Workshop;InstallDir]/include" + PATH_SUFFIXES "HTML Help Workshop/include" ) find_library(HTML_HELP_LIBRARY - htmlhelp - "${HTML_HELP_COMPILER_PATH}/lib" - "[HKEY_CURRENT_USER\\Software\\Microsoft\\HTML Help Workshop;InstallDir]/lib" - "$ENV{ProgramFiles}/HTML Help Workshop/lib" - "$ENV{_PF86}/HTML Help Workshop/lib" - "C:/Program Files/HTML Help Workshop/lib" - "C:/Program Files (x86)/HTML Help Workshop/lib" + NAMES htmlhelp + PATHS + "${HTML_HELP_COMPILER_PATH}/lib" + "[HKEY_CURRENT_USER\\Software\\Microsoft\\HTML Help Workshop;InstallDir]/lib" + PATH_SUFFIXES "HTML Help Workshop/lib" ) mark_as_advanced( |