mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-04-22 14:23:10 -05:00
Code Issues Packages Projects Releases Wiki Activity

FindHTMLHelp: Use PATH_SUFFIXES to search under Program Files

Browse Source 
The find commands already know how to search in variants of the
Program Files folders on Windows.  Use PATH_SUFFIXES to tell them
under what directory within Program Files to find htmlhelp.

Fixes: #16950
This commit is contained in:
Brad King
2017-06-09 11:13:32 -04:00
parent 591557ba45
commit fcbecbd2af
1 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Modules/FindHTMLHelp.cmake
+14 -14
View File
@@ -18,28 +18,28 @@
if(WIN32) if(WIN32)
find_program(HTML_HELP_COMPILER find_program(HTML_HELP_COMPILER
hhc NAMES hhc
"[HKEY_CURRENT_USER\\Software\\Microsoft\\HTML Help Workshop;InstallDir]" PATHS
"$ENV{ProgramFiles}/HTML Help Workshop" "[HKEY_CURRENT_USER\\Software\\Microsoft\\HTML Help Workshop;InstallDir]"
"C:/Program Files/HTML Help Workshop" PATH_SUFFIXES "HTML Help Workshop"
) )
get_filename_component(HTML_HELP_COMPILER_PATH "${HTML_HELP_COMPILER}" PATH) get_filename_component(HTML_HELP_COMPILER_PATH "${HTML_HELP_COMPILER}" PATH)
find_path(HTML_HELP_INCLUDE_PATH find_path(HTML_HELP_INCLUDE_PATH
htmlhelp.h NAMES htmlhelp.h
"${HTML_HELP_COMPILER_PATH}/include" PATHS
"[HKEY_CURRENT_USER\\Software\\Microsoft\\HTML Help Workshop;InstallDir]/include" "${HTML_HELP_COMPILER_PATH}/include"
"$ENV{ProgramFiles}/HTML Help Workshop/include" "[HKEY_CURRENT_USER\\Software\\Microsoft\\HTML Help Workshop;InstallDir]/include"
"C:/Program Files/HTML Help Workshop/include" PATH_SUFFIXES "HTML Help Workshop/include"
) )
find_library(HTML_HELP_LIBRARY find_library(HTML_HELP_LIBRARY
htmlhelp NAMES htmlhelp
"${HTML_HELP_COMPILER_PATH}/lib" PATHS
"[HKEY_CURRENT_USER\\Software\\Microsoft\\HTML Help Workshop;InstallDir]/lib" "${HTML_HELP_COMPILER_PATH}/lib"
"$ENV{ProgramFiles}/HTML Help Workshop/lib" "[HKEY_CURRENT_USER\\Software\\Microsoft\\HTML Help Workshop;InstallDir]/lib"
"C:/Program Files/HTML Help Workshop/lib" PATH_SUFFIXES "HTML Help Workshop/lib"
) )
mark_as_advanced( mark_as_advanced(