aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGraham Bloice <graham.bloice@trihedral.com>2017-11-07 13:35:34 +0000
committerGraham Bloice <graham.bloice@trihedral.com>2017-11-07 16:17:08 +0000
commitaec48301de696a4350e4b477b7f27009c1848792 (patch)
tree7a931c26fdfd1b4126f0ac40b0bad6b9361e5351
parent5383c95b6f8991a408774686fc6eedb01f89e181 (diff)
downloadwireshark-aec48301de696a4350e4b477b7f27009c1848792.tar.gz
wireshark-aec48301de696a4350e4b477b7f27009c1848792.tar.bz2
wireshark-aec48301de696a4350e4b477b7f27009c1848792.zip
Open Windows CHM Help from Help menu.
Renable the link between the Menu help command and the locally installed CHM help file. This allows the user to acces the appropriate help built for their specific version rather than the latest version on the Wireshark web site. Change-Id: I7bb3d418ba405d6c7614ab6d52f7b0eda843d0de Reviewed-on: https://code.wireshark.org/review/24276 Petri-Dish: Graham Bloice <graham.bloice@trihedral.com> Tested-by: Petri Dish Buildbot Reviewed-by: Graham Bloice <graham.bloice@trihedral.com> (cherry picked from commit 62e81c5846afab51757eb48826ac02522e9864f3) Reviewed-on: https://code.wireshark.org/review/24279
-rw-r--r--ui/CMakeLists.txt6
1 files changed, 5 insertions, 1 deletions
diff --git a/ui/CMakeLists.txt b/ui/CMakeLists.txt
index e02eab1c6e..2e35d63083 100644
--- a/ui/CMakeLists.txt
+++ b/ui/CMakeLists.txt
@@ -19,7 +19,6 @@
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
#
-
set(COMMON_UI_SRC
alert_box.c
capture.c
@@ -97,6 +96,11 @@ set_target_properties(ui PROPERTIES COMPILE_OPTIONS "${WS_WARNINGS_C_FLAGS}")
set_target_properties(ui PROPERTIES LINK_FLAGS "${WS_LINK_FLAGS}")
set_target_properties(ui PROPERTIES FOLDER "UI")
+if (HTML_HELP_COMPILER)
+ add_definitions(-DHHC_DIR)
+ target_link_libraries(ui Htmlhelp.lib)
+endif()
+
CHECKAPI(
NAME
ui-base