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/10/19 06:42:51 UTC
[qpid-dispatch] branch dev-protocol-adaptors-2 updated: NO-JIRA
install nghttp2 in Travis and GHA CI (#886)
This is an automated email from the ASF dual-hosted git repository.
jdanek pushed a commit to branch dev-protocol-adaptors-2
in repository https://gitbox.apache.org/repos/asf/qpid-dispatch.git
The following commit(s) were added to refs/heads/dev-protocol-adaptors-2 by this push:
new 8486ef4 NO-JIRA install nghttp2 in Travis and GHA CI (#886)
8486ef4 is described below
commit 8486ef433d62e1e85f6e213008be05a1a7a4f869
Author: Jiri Daněk <jd...@redhat.com>
AuthorDate: Mon Oct 19 08:42:43 2020 +0200
NO-JIRA install nghttp2 in Travis and GHA CI (#886)
---
.github/workflows/build.yaml | 2 +-
.travis.yml | 2 +-
cmake/Findlibnghttp2.cmake | 4 ++--
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index f7e5999..979e9ae 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -105,7 +105,7 @@ jobs:
- name: Install Linux dependencies
if: ${{ runner.os == 'Linux' }}
run: |
- sudo apt install -y swig libpython3-dev libsasl2-dev libjsoncpp-dev libwebsockets-dev ccache ninja-build pixz
+ sudo apt install -y swig libpython3-dev libsasl2-dev libjsoncpp-dev libwebsockets-dev libnghttp2-dev ccache ninja-build pixz
- name: Zero ccache stats
run: ccache -z
diff --git a/.travis.yml b/.travis.yml
index 4558a52..35ff0c5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -85,7 +85,7 @@ jobs:
before_install:
- bash ./macports.sh
- export COLUMNS=80
- - yes | sudo port install cmake swig swig-python libuv jsoncpp libwebsockets cyrus-sasl2 pkgconfig python37 py37-pip
+ - yes | sudo port install cmake swig swig-python libuv jsoncpp libwebsockets nghttp2 cyrus-sasl2 pkgconfig python37 py37-pip
# set aliases for CMake's PythonInterp and PythonLibs to find MacPort's `python` on the path first
- sudo port select --set python python37
- sudo port select --set python3 python37
diff --git a/cmake/Findlibnghttp2.cmake b/cmake/Findlibnghttp2.cmake
index 50950f4..fe75579 100644
--- a/cmake/Findlibnghttp2.cmake
+++ b/cmake/Findlibnghttp2.cmake
@@ -23,9 +23,9 @@ find_library(NGHTTP2_LIBRARIES
)
find_path(NGHTTP2_INCLUDE_DIRS
- NAMES nghttp2.h
+ NAMES "nghttp2/nghttp2.h"
HINTS "${CMAKE_INSTALL_PREFIX}/include"
- PATHS "/usr/include/nghttp2"
+ PATHS "/usr/include"
)
include(FindPackageHandleStandardArgs)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org