Use the FindHTMLHelp.cmake provided by cmake to find the hhc.

Lower case some function/macro calls.

Change-Id: I57532e3b4701963b88a536a7ecfe7dfaf4be3d4c
Reviewed-on: https://code.wireshark.org/review/6436
Reviewed-by: Jörg Mayer <jmayer@loplof.de>

diff --git a/cmake/modules/FindHHC.cmake b/cmake/modules/FindHHC.cmake
index 427002f8312428a8152fadd0a0cae83a5ed4cfa2..14752c422df2c8418dd18e9d4ee52e4e860087c3 100644 (file)
--- a/cmake/modules/FindHHC.cmake
+++ b/cmake/modules/FindHHC.cmake
@@ -4,17 +4,13 @@
 # Sets HHC_WRAPPER to a wrapper script that ignores hhc.exe's return value.
 #
 
-FIND_PROGRAM(HHC_EXECUTABLE
-  NAMES
-    hhc
-  HINTS
-    $ENV{PROGRAMFILES}/HTML Help Workshop
-)
+find_package(HTMLHelp)
+set(HHC_EXECUTABLE ${HTML_HELP_COMPILER})
 
-INCLUDE(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(HHC DEFAULT_MSG HHC_EXECUTABLE)
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(HHC DEFAULT_MSG HHC_EXECUTABLE)
 
-MARK_AS_ADVANCED(HHC_EXECUTABLE)
+mark_as_advanced(HHC_EXECUTABLE)
 
 if(WIN32)
   # hhc.exe returns 1 on success. Create a wrapper script that ignores
@@ -25,6 +21,6 @@ if(WIN32)
     ${HHC_WRAPPER}
     NEWLINE_STYLE WIN32
   )
-  FIND_PACKAGE_HANDLE_STANDARD_ARGS(HHC DEFAULT_MSG HHC_WRAPPER)
-  MARK_AS_ADVANCED(HHC_WRAPPER)
+  find_package_handle_standard_args(HHC DEFAULT_MSG HHC_WRAPPER)
+  mark_as_advanced(HHC_WRAPPER)
 endif()