Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 12 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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: |
Expand Down Expand Up @@ -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
4 changes: 2 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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_]+)[ ]*$")
Expand Down Expand Up @@ -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)

#-------------------------------------------------
#
Expand Down
2 changes: 1 addition & 1 deletion include/boost/burl/session.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
#include <boost/capy/ex/run_async.hpp>
#include <boost/capy/io_task.hpp>
#include <boost/corosio/io_context.hpp>
#include <boost/corosio/tls/openssl_stream.hpp>
#include <boost/corosio/openssl_stream.hpp>
#include <boost/http/fields.hpp>
#include <boost/http/method.hpp>
#include <boost/json/value.hpp>
Expand Down
2 changes: 1 addition & 1 deletion src/session.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
#include <boost/http/serializer.hpp>
#include <boost/http/response_parser.hpp>
#include <boost/corosio/socket.hpp>
#include <boost/corosio/tls/openssl_stream.hpp>
#include <boost/corosio/openssl_stream.hpp>
#include <boost/json/parse.hpp>

#include <map>
Expand Down
Loading