From c38dbd5c0466c9516da7046ceb4c9e4a118977c9 Mon Sep 17 00:00:00 2001
From: Nicolas Werner <nicolas.werner@hotmail.de>
Date: Fri, 17 Jan 2020 23:02:00 +0100
Subject: [PATCH] Seems like openssl is still needed for hunter build?
---
.ci/script.sh | 4 ++++
.travis.yml | 1 +
CMakeLists.txt | 5 +++--
cmake/Hunter/config.cmake | 1 +
4 files changed, 9 insertions(+), 2 deletions(-)
create mode 100644 cmake/Hunter/config.cmake
diff --git a/.ci/script.sh b/.ci/script.sh
index 41f205e8e..dc47c8928 100755
--- a/.ci/script.sh
+++ b/.ci/script.sh
@@ -33,11 +33,15 @@ fi
if [ $TRAVIS_OS_NAME == osx ]; then
# Build the library.
+ export OPENSSL_ROOT_DIR=/usr/local/opt/openssl
cmake -H. -Bbuild \
+ -DOPENSSL_ROOT_DIR=/usr/local/opt/openssl \
+ -DOPENSSL_INCLUDE_DIR=/usr/local/opt/openssl/include \
-DBUILD_LIB_TESTS=OFF \
-DBUILD_SHARED_LIBS=ON \
-DHUNTER_ENABLED=ON \
-DHUNTER_ROOT=/tmp/.deps \
+ -DUSE_BUNDLED_OPENSSL=OFF \
-DUSE_BUNDLED_GTEST=OFF || true
cmake --build build
diff --git a/.travis.yml b/.travis.yml
index 70b71d633..2c8ad37e2 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -21,6 +21,7 @@ matrix:
packages:
- clang-format
- ninja
+ - openssl
- os: linux
compiler: gcc
env:
diff --git a/CMakeLists.txt b/CMakeLists.txt
index f60cada02..7262d25cd 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -14,8 +14,9 @@ option(HUNTER_ENABLED "Enable Hunter package manager" OFF)
include("cmake/HunterGate.cmake")
#set(HUNTER_ENABLED OFF)
HunterGate(
- URL "https://github.com/cpp-pm/hunter/archive/v0.23.242.tar.gz"
- SHA1 "503b149d0ebdbc598e498f1669ae828a2136b838"
+ URL "https://github.com/cpp-pm/hunter/archive/v0.23.244.tar.gz"
+ SHA1 "2c0f491fd0b80f7b09e3d21adb97237161ef9835"
+ LOCAL
)
option(USE_BUNDLED_BOOST "Use the bundled version of Boost." ${HUNTER_ENABLED})
diff --git a/cmake/Hunter/config.cmake b/cmake/Hunter/config.cmake
new file mode 100644
index 000000000..e00651c05
--- /dev/null
+++ b/cmake/Hunter/config.cmake
@@ -0,0 +1 @@
+hunter_config(Boost VERSION 1.70.0)
--
GitLab