You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by jd...@apache.org on 2020/12/14 09:50:32 UTC
[qpid-dispatch] branch master updated: DISPATCH-1881 fix build
dependencies for http2 protocol adaptor (#945)
This is an automated email from the ASF dual-hosted git repository.
jdanek pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/qpid-dispatch.git
The following commit(s) were added to refs/heads/master by this push:
new 723d848 DISPATCH-1881 fix build dependencies for http2 protocol adaptor (#945)
723d848 is described below
commit 723d848ee41a479f9c3fd305d48adebf91853517
Author: Jiri Daněk <jd...@redhat.com>
AuthorDate: Mon Dec 14 10:50:24 2020 +0100
DISPATCH-1881 fix build dependencies for http2 protocol adaptor (#945)
---
CMakeLists.txt | 4 ++--
cmake/Findlibnghttp2.cmake | 4 ----
2 files changed, 2 insertions(+), 6 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index ef6229f..1f649af 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -57,8 +57,9 @@ endif (NOT APPLE)
find_package(PythonInterp REQUIRED)
find_package(PythonLibs REQUIRED)
find_package(Threads REQUIRED)
-find_package(Proton 0.23 REQUIRED COMPONENTS Core Proactor)
+find_package(Proton 0.33.0 REQUIRED COMPONENTS Core Proactor)
message(STATUS "Found Proton: ${Proton_LIBRARIES} (found version \"${Proton_VERSION}\")" )
+find_package(libnghttp2 1.4.0 REQUIRED)
##
## Optional dependencies
@@ -66,7 +67,6 @@ message(STATUS "Found Proton: ${Proton_LIBRARIES} (found version \"${Proton_VERS
# Web Sockets
find_package(LibWebSockets 2.4.2)
-find_package(libnghttp2 1.4.0)
CMAKE_DEPENDENT_OPTION(USE_LIBWEBSOCKETS "Use libwebsockets for WebSocket support" ON
"LIBWEBSOCKETS_FOUND" OFF)
if (LIBWEBSOCKETS_FOUND AND LIBWEBSOCKETS_VERSION_STRING)
diff --git a/cmake/Findlibnghttp2.cmake b/cmake/Findlibnghttp2.cmake
index fe75579..26fae71 100644
--- a/cmake/Findlibnghttp2.cmake
+++ b/cmake/Findlibnghttp2.cmake
@@ -19,7 +19,6 @@
find_library(NGHTTP2_LIBRARIES
NAMES libnghttp2 nghttp2
- REQUIRED
)
find_path(NGHTTP2_INCLUDE_DIRS
@@ -31,6 +30,3 @@ find_path(NGHTTP2_INCLUDE_DIRS
include(FindPackageHandleStandardArgs)
find_package_handle_standard_args(
libnghttp2 DEFAULT_MSG NGHTTP2_LIBRARIES NGHTTP2_INCLUDE_DIRS)
-
-
-
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org