diff options
| author | Gerald Combs <gerald@wireshark.org> | 2015-01-09 08:58:15 -0800 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2015-01-09 17:49:37 +0000 |
| commit | 4f658999e68791d083213eabf0de4202e5e4ab46 (patch) | |
| tree | 7776f3794c1c55415f0d4bac2b77585aac9f34d6 /docbook/CMakeLists.txt | |
| parent | ffb6f10f4eb0ad126a8496981cfaac0fb324bbc8 (diff) | |
| download | wireshark-4f658999e68791d083213eabf0de4202e5e4ab46.tar.gz | |
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>
Diffstat (limited to 'docbook/CMakeLists.txt')
| -rw-r--r-- | docbook/CMakeLists.txt | 21 |
1 files changed, 12 insertions, 9 deletions
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 |