From b1cc056b12702435f6ebdc6ba0a8e17a41e159a0 Mon Sep 17 00:00:00 2001 From: Balint Reczey Date: Fri, 26 Aug 2016 15:18:29 +0200 Subject: Remove nghttp2 code and use system' nghttp2 Update debian, macos (setup / homebrew) download script Update testsuite (don't try HPACK when build without nghttp2) Change-Id: I365e5e17bc4fab4acd81b4c39ea7189a5d1ee112 Reviewed-on: https://code.wireshark.org/review/17347 Reviewed-by: Gerald Combs Reviewed-by: Peter Wu Petri-Dish: Gerald Combs Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann --- CMakeLists.txt | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) (limited to 'CMakeLists.txt') diff --git a/CMakeLists.txt b/CMakeLists.txt index 68db05c7a1..77da07a484 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -709,7 +709,7 @@ endif() # - set HAVE_XXX #The minimum package list -set(PACKAGELIST Gettext M Git GLIB2 GMODULE2 GTHREAD2 LEX YACC Perl SED SH PythonInterp) +set(PACKAGELIST Gettext M Git GLIB2 GMODULE2 GTHREAD2 LEX YACC Perl SED SH PythonInterp NGHTTP2) set(LEX_REQUIRED TRUE) set(GLIB2_REQUIRED TRUE) set(GLIB2_FIND_REQUIRED TRUE) @@ -940,6 +940,9 @@ endif() if(LIBSSH_FOUND) set(HAVE_LIBSSH 1) endif() +if(NGHTTP2_FOUND) + set(HAVE_NGHTTP2 1) +endif() if(HAVE_LIBCARES) set(HAVE_C_ARES 1) endif() @@ -1548,6 +1551,13 @@ if(WIN32) "${_dll_output_dir}" ) endif(LUA_FOUND) + if (NGHTTP2_FOUND) + add_custom_command(TARGET copy_cli_dlls PRE_BUILD + COMMAND ${CMAKE_COMMAND} -E copy_if_different + "${NGHTTP2_DLL_DIR}/${NGHTTP2_DLL}" + "${_dll_output_dir}" + ) + endif(NGHTTP2_FOUND) if (SMI_FOUND) # Wireshark.nsi wants SMI_DIR which is the base SMI directory get_filename_component(SMI_DIR ${SMI_DLL_DIR} DIRECTORY) -- cgit v1.2.3