osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity
79,108 Commits 23 Branches 0 Tags 1.3 GiB
Commit Graph

3 Commits

Author SHA1 Message Date
Graham Bloice b6d6eb9097 CMake: Detection of HTMHelp 
CMake erroneously reports that HTMLHelp wasn't found

The override of FindHTMLHelp.cmake now uses
FIND_PACKAGE_HANDLE_STANDARD_ARGS to do this correctly.

Change-Id: I1bd24964365dea00af213092872e24cbfb5ee07d
Reviewed-on: https://code.wireshark.org/review/24281
Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
Petri-Dish: Graham Bloice <graham.bloice@trihedral.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
 2017-11-07 23:01:44 +00:00
Anders 0dc32776d0 Simplify the search for HTMLHelp. 
Change updated as per https://gitlab.kitware.com/cmake/cmake/issues/16950#note_277462

Change-Id: I794e6cf7af3d1affa7ee5182374b6f22d9acdf33
Reviewed-on: https://code.wireshark.org/review/22051
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
 2017-06-10 16:11:12 +00:00
Graham Bloice fce2f2bb1f CMake: Add local copy of FindHTMLHelp.cmake 
Add a local copy of FindHTMLHelp.cmake to search for hhc.exe that
includes the 32 bit program files locations "Program Files (x86)"
as this is where hhc.exe normally lives.

Change-Id: Ic5917a0765786ac483a7d4ef457043319d0e8501
Reviewed-on: https://code.wireshark.org/review/22037
Petri-Dish: Graham Bloice <graham.bloice@trihedral.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
 2017-06-08 13:30:54 +00:00