From 4f658999e68791d083213eabf0de4202e5e4ab46 Mon Sep 17 00:00:00 2001
From: Gerald Combs <gerald@wireshark.org>
Date: Fri, 9 Jan 2015 08:58:15 -0800
Subject: CMake: Migrate to hhc.cmake.

Remove FindHHC.cmake in favor of CMake's FindHTMLHelp. Remove the
hhc.cmd wrapper.

Change-Id: I548e58d2264c74596e9067d5053b056c35089b3c
Reviewed-on: https://code.wireshark.org/review/6449
Reviewed-by: Gerald Combs <gerald@wireshark.org>
---
 docbook/CMakeLists.txt | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

(limited to 'docbook/CMakeLists.txt')

diff --git a/docbook/CMakeLists.txt b/docbook/CMakeLists.txt
index 6bc3d64772..33c21f1314 100644
--- a/docbook/CMakeLists.txt
+++ b/docbook/CMakeLists.txt
@@ -23,27 +23,30 @@ find_package( FOP ) # Call before XSLTPROC
 find_package( LYNX )
 find_package( XSLTPROC )
 find_package( XMLLINT )
-find_package( HHC )
+find_package( HTMLHelp )
 
 find_package( ASCIIDOC )
 
 if(WIN32)
-	MACRO( HHP2CHM _hhpsource )
-		GET_FILENAME_COMPONENT( _source_base_name ${_hhpsource} NAME_WE )
+	macro( HHP2CHM _hhpsource )
+		get_filename_component( _source_base_name ${_hhpsource} NAME_WE )
 
-		ADD_CUSTOM_COMMAND(
+		add_custom_command(
 			OUTPUT ${_output_chm}
 			WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
-			# hhc.exe returns 1 on success.
-			COMMAND ${HHC_WRAPPER} ${_hhpsource}
+			# The number and order of arguments MUST match hhc.cmake.
+			COMMAND ${CMAKE_COMMAND} -P
+				${CMAKE_SOURCE_DIR}/cmake/modules/hhc.cmake
+					"${HTML_HELP_COMPILER}"
+					${_hhpsource}
 			DEPENDS
 				${_hhpsource}
 		)
-	ENDMACRO()
+	endmacro()
 else()
-	MACRO( HHP2CHM _hhpsource )
+	macro( HHP2CHM _hhpsource )
 	# Dummy.
-	ENDMACRO()
+	endmacro()
 endif()
 
 set(COMMON_GRAPHICS
-- 
cgit v1.2.1