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 /cmake/modules/hhc.cmake | |
| parent | ffb6f10f4eb0ad126a8496981cfaac0fb324bbc8 (diff) | |
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 'cmake/modules/hhc.cmake')
| -rw-r--r-- | cmake/modules/hhc.cmake | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/cmake/modules/hhc.cmake b/cmake/modules/hhc.cmake index 2b98dfa562..6855ee7789 100644 --- a/cmake/modules/hhc.cmake +++ b/cmake/modules/hhc.cmake @@ -1,9 +1,12 @@ # hhc.exe returns 1 on success - which cmake instprets as failure in case # of add_custom_command. -# Params 0,1 and 2 are "cmake -P hhc.cmake" -set(_param ${CMAKE_ARGV3}) +# Params are +# cmake -P /path/to/hhc.cmake "/path/to/hhc.exe" project.hhp +set(_hhc_executable ${CMAKE_ARGV3}) +set(_project_file ${CMAKE_ARGV4}) -EXECUTE_PROCESS( - COMMAND ${HHC_EXECUTABLE} ${_param} +execute_process( + COMMAND ${_hhc_executable} ${_project_file} + RESULT_VARIABLE _return_code ) |