From 26f52d23a67d888cde269366773e2bf22f907feb Mon Sep 17 00:00:00 2001 From: tastytea Date: Sat, 31 Oct 2020 18:31:52 +0100 Subject: [PATCH] Add libcurl dependency to CI and RPM. --- .drone.yml | 10 +++++----- cmake/packages.cmake | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.drone.yml b/.drone.yml index b64945d..471ebad 100644 --- a/.drone.yml +++ b/.drone.yml @@ -24,7 +24,7 @@ steps: - rm /etc/apt/apt.conf.d/docker-clean - alias apt-get='rm -f /var/cache/apt/archives/lock && apt-get' - apt-get update -q - - apt-get install -qy g++-7 cmake libpoco-dev libboost-locale-dev asciidoc catch + - apt-get install -qy g++-7 cmake libpoco-dev libboost-locale-dev libcurl4-openssl-dev asciidoc catch - rm -rf build && mkdir -p build && cd build - cmake -DWITH_MOZILLA=YES -DWITH_TESTS=YES .. - make VERBOSE=1 @@ -52,7 +52,7 @@ steps: - gpg --armor --export 0x60c317803a41ba51845e371a1e9377a2ba9ef27f | apt-key add - - apt-get update -q - apt-get install -qy -t bionic g++-9 - - apt-get install -qy cmake libpoco-dev libboost-locale-dev asciidoc catch + - apt-get install -qy cmake libpoco-dev libboost-locale-dev libcurl4-openssl-dev asciidoc catch - rm -rf build && mkdir -p build && cd build - cmake -DWITH_MOZILLA=YES .. - make VERBOSE=1 @@ -71,7 +71,7 @@ steps: - rm /etc/apt/apt.conf.d/docker-clean - alias apt-get='rm -f /var/cache/apt/archives/lock && apt-get' - apt-get update -q - - apt-get install -qy clang-6.0 cmake libpoco-dev libboost-locale-dev asciidoc catch + - apt-get install -qy clang-6.0 cmake libpoco-dev libboost-locale-dev libcurl4-openssl-dev asciidoc catch - rm -rf build && mkdir -p build && cd build - cmake -DWITH_MOZILLA=YES .. - make VERBOSE=1 @@ -90,7 +90,7 @@ steps: - rm /etc/apt/apt.conf.d/docker-clean - alias apt-get='rm -f /var/cache/apt/archives/lock && apt-get' - apt-get update -q - - apt-get install -qy clang cmake libpoco-dev libboost-locale-dev asciidoc catch + - apt-get install -qy clang cmake libpoco-dev libboost-locale-dev libcurl4-openssl-dev asciidoc catch - rm -rf build && mkdir -p build && cd build - cmake -DWITH_MOZILLA=YES .. - make VERBOSE=1 @@ -140,7 +140,7 @@ steps: - rm /etc/apt/apt.conf.d/docker-clean - alias apt-get='rm -f /var/cache/apt/archives/lock && apt-get' - apt-get update -q - - apt-get install -qy g++ cmake libpoco-dev libboost-locale-dev asciidoc catch + - apt-get install -qy g++ cmake libpoco-dev libboost-locale-dev libcurl4-openssl-dev asciidoc catch - apt-get install -qy build-essential file zip - rm -rf build && mkdir -p build && cd build - cmake -DCMAKE_INSTALL_PREFIX=/usr -DWITH_MOZILLA=YES -DMOZILLA_NMH_DIR="lib/mozilla/native-messaging-hosts" -DWITH_DEB=YES .. diff --git a/cmake/packages.cmake b/cmake/packages.cmake index 806fddc..23695c6 100644 --- a/cmake/packages.cmake +++ b/cmake/packages.cmake @@ -44,7 +44,7 @@ if (WITH_RPM) set(CPACK_RPM_PACKAGE_LICENSE "GPL-3") set(CPACK_RPM_PACKAGE_URL "https://schlomp.space/tastytea/${PROJECT_NAME}") set(CPACK_RPM_PACKAGE_REQUIRES - "poco-netssl >= 1.6, poco-sqlite >= 1.6") + "poco-net >= 1.6, poco-sqlite >= 1.6, libcurl >= 7.52") set(CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}-0.${CPACK_PACKAGE_ARCHITECTURE}") set(CPACK_SOURCE_PACKAGE_FILE_NAME