diff options
| author | Brad King <brad.king@kitware.com> | 2017-06-12 14:15:44 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2017-06-12 14:20:23 (GMT) |
| commit | 22b412c32574986720198445172e8a460429eba1 (patch) | |
| tree | 5d5df09ff223f7cbee2b30dfcb6048c6298c0f68 | |
| parent | aa9d0afc525b84806bc2f897fbc854fe0e0070f9 (diff) | |
| parent | fcbecbd2afcf3fcfd4662946615fec5e4c73ed84 (diff) | |
| download | CMake-22b412c32574986720198445172e8a460429eba1.zip CMake-22b412c32574986720198445172e8a460429eba1.tar.gz CMake-22b412c32574986720198445172e8a460429eba1.tar.bz2 | |
Merge topic 'FindHTMLHelp-path-suffixes'
fcbecbd2 FindHTMLHelp: Use PATH_SUFFIXES to search under Program Files
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !948
| -rw-r--r-- | Modules/FindHTMLHelp.cmake | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/Modules/FindHTMLHelp.cmake b/Modules/FindHTMLHelp.cmake index 84e2458..6aab8a7 100644 --- a/Modules/FindHTMLHelp.cmake +++ b/Modules/FindHTMLHelp.cmake @@ -18,28 +18,28 @@ if(WIN32) find_program(HTML_HELP_COMPILER - hhc - "[HKEY_CURRENT_USER\\Software\\Microsoft\\HTML Help Workshop;InstallDir]" - "$ENV{ProgramFiles}/HTML Help Workshop" - "C:/Program Files/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" - "C:/Program Files/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" - "C:/Program Files/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( |