diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ebe64c6..cb50ae4 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -91,7 +91,7 @@ jobs: - name: Install packages uses: alandefreitas/cpp-actions/package-install@v1.9.0 with: - apt-get: build-essential + apt-get: build-essential libssl-dev - name: Clone Boost uses: alandefreitas/cpp-actions/boost-clone@v1.9.0 @@ -102,6 +102,16 @@ jobs: scan-modules-dir: burl-root scan-modules-ignore: burl + - name: Clone cppalliance dependencies + run: | + set -xe + cd boost-source/libs + git clone --depth 1 -b develop https://github.com/cppalliance/capy.git + git clone --depth 1 -b develop https://github.com/cppalliance/corosio.git + git clone --depth 1 -b develop https://github.com/cppalliance/http.git + git clone --depth 1 -b develop https://github.com/boostorg/filesystem.git + git clone --depth 1 -b develop https://github.com/boostorg/scope.git + - name: Patch Boost id: patch run: | @@ -137,5 +147,5 @@ jobs: cmake-version: '>=3.20' extra-args: | -D Boost_VERBOSE=ON - -D BOOST_INCLUDE_LIBRARIES=burl + -D BOOST_INCLUDE_LIBRARIES=burl;capy;corosio;http;asio;filesystem;scope ref-source-dir: boost-root/libs/burl diff --git a/CMakeLists.txt b/CMakeLists.txt index a03a906..0c2d5fa 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -61,8 +61,7 @@ set(BOOST_BURL_DEPENDENCIES Boost::url) # OpenSSL dependencies (added after find_package) -set(BOOST_BURL_OPENSSL_DEPENDENCIES - Boost::corosio_openssl) +set(BOOST_BURL_OPENSSL_DEPENDENCIES) foreach (BOOST_BURL_DEPENDENCY ${BOOST_BURL_DEPENDENCIES}) if (BOOST_BURL_DEPENDENCY MATCHES "^[ ]*Boost::([A-Za-z0-9_]+)[ ]*$") @@ -163,6 +162,7 @@ endfunction() add_library(boost_burl ${BOOST_BURL_HEADERS} ${BOOST_BURL_SOURCES}) add_library(Boost::burl ALIAS boost_burl) boost_burl_setup_properties(boost_burl) +target_link_libraries(boost_burl PUBLIC OpenSSL::SSL OpenSSL::Crypto) #------------------------------------------------- # diff --git a/include/boost/burl/session.hpp b/include/boost/burl/session.hpp index a7b29c1..f0cd84d 100644 --- a/include/boost/burl/session.hpp +++ b/include/boost/burl/session.hpp @@ -21,7 +21,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/session.cpp b/src/session.cpp index 8afbc04..2c4049c 100644 --- a/src/session.cpp +++ b/src/session.cpp @@ -13,7 +13,7 @@ #include #include #include -#include +#include #include #include