Skip to content
Merged
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
24 changes: 12 additions & 12 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -252,7 +252,7 @@ jobs:
path: burl-root

- name: Setup C++
uses: alandefreitas/cpp-actions/setup-cpp@v1.9.0
uses: alandefreitas/cpp-actions/setup-cpp@v1.9.4
id: setup-cpp
with:
compiler: ${{ matrix.compiler }}
Expand All @@ -261,7 +261,7 @@ jobs:
trace-commands: true

- name: Install packages
uses: alandefreitas/cpp-actions/package-install@v1.9.0
uses: alandefreitas/cpp-actions/package-install@v1.9.4
id: package-install
with:
apt-get-add-architecture: ${{ matrix.x86 && 'i386' || '' }}
Expand Down Expand Up @@ -292,7 +292,7 @@ jobs:
path: corosio-root

- name: Clone Boost
uses: alandefreitas/cpp-actions/boost-clone@v1.9.0
uses: alandefreitas/cpp-actions/boost-clone@v1.9.4
id: boost-clone
with:
branch: ${{ (github.ref_name == 'master' && github.ref_name) || 'develop' }}
Expand All @@ -302,7 +302,7 @@ jobs:
scan-modules-ignore: burl,http,capy,corosio

- name: Install Packages (Windows)
uses: alandefreitas/cpp-actions/package-install@v1.9.0
uses: alandefreitas/cpp-actions/package-install@v1.9.4
if: ${{ startsWith(matrix.runs-on, 'windows') }}
id: package-install-windows
with:
Expand Down Expand Up @@ -384,7 +384,7 @@ jobs:
cp -r "$workspace_root"/corosio-root "libs/corosio"

- name: Boost B2 Workflow
uses: alandefreitas/cpp-actions/b2-workflow@v1.9.0
uses: alandefreitas/cpp-actions/b2-workflow@v1.9.4
if: ${{ !matrix.coverage }}
env:
ASAN_OPTIONS: ${{ ((matrix.compiler == 'apple-clang' || matrix.compiler == 'clang') && 'detect_invalid_pointer_pairs=0:strict_string_checks=1:detect_stack_use_after_return=1:check_initialization_order=1:strict_init_order=1') || 'detect_invalid_pointer_pairs=2:strict_string_checks=1:detect_stack_use_after_return=1:check_initialization_order=1:strict_init_order=1' }}
Expand All @@ -405,7 +405,7 @@ jobs:
stop-on-error: true

- name: Boost CMake Workflow
uses: alandefreitas/cpp-actions/cmake-workflow@v1.9.0
uses: alandefreitas/cpp-actions/cmake-workflow@v1.9.4
if: ${{ matrix.coverage || matrix.build-cmake || matrix.is-earliest }}
with:
source-dir: boost-root
Expand Down Expand Up @@ -446,7 +446,7 @@ jobs:
# This causes find_package(Boost COMPONENTS burl) to fail because
# boost_burlConfig.cmake is never installed.
- name: Find Package Integration Workflow
uses: alandefreitas/cpp-actions/cmake-workflow@v1.9.0
uses: alandefreitas/cpp-actions/cmake-workflow@v1.9.4
if: false # ${{ matrix.build-cmake || matrix.is-earliest }}
with:
source-dir: boost-root/libs/${{ steps.patch.outputs.module }}/test/cmake_test
Expand All @@ -470,7 +470,7 @@ jobs:
toolchain: ${{ (startsWith(matrix.runs-on, 'windows') && steps.patch-user-config.outputs.toolchain) || '' }}

- name: Subdirectory Integration Workflow
uses: alandefreitas/cpp-actions/cmake-workflow@v1.9.0
uses: alandefreitas/cpp-actions/cmake-workflow@v1.9.4
if: ${{ matrix.build-cmake || matrix.is-earliest }}
with:
source-dir: boost-root/libs/${{ steps.patch.outputs.module }}/test/cmake_test
Expand All @@ -491,7 +491,7 @@ jobs:
toolchain: ${{ (startsWith(matrix.runs-on, 'windows') && steps.patch-user-config.outputs.toolchain) || '' }}

- name: Root Project CMake Workflow
uses: alandefreitas/cpp-actions/cmake-workflow@v1.9.0
uses: alandefreitas/cpp-actions/cmake-workflow@v1.9.4
if: ${{ matrix.build-cmake || matrix.is-earliest }}
with:
source-dir: boost-root/libs/${{ steps.patch.outputs.module }}
Expand Down Expand Up @@ -562,7 +562,7 @@ jobs:
fetch-depth: 100

- name: Changelog
uses: alandefreitas/cpp-actions/create-changelog@v1.9.0
uses: alandefreitas/cpp-actions/create-changelog@v1.9.4
with:
thank-non-regular: ${{ startsWith(github.ref, 'refs/tags/') }}
github-token: ${{ secrets.GITHUB_TOKEN }}
Expand All @@ -580,7 +580,7 @@ jobs:
shell: bash
steps:
- name: Install packages
uses: alandefreitas/cpp-actions/package-install@v1.9.0
uses: alandefreitas/cpp-actions/package-install@v1.9.4
with:
apt-get: git cmake

Expand Down Expand Up @@ -611,7 +611,7 @@ jobs:
path: corosio-root

- name: Clone Boost
uses: alandefreitas/cpp-actions/boost-clone@v1.9.0
uses: alandefreitas/cpp-actions/boost-clone@v1.9.4
id: boost-clone
with:
branch: ${{ (github.ref_name == 'master' && github.ref_name) || 'develop' }}
Expand Down
109 changes: 0 additions & 109 deletions .github/workflows/slodd-notify.yml

This file was deleted.

9 changes: 8 additions & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ if (NOT BOOST_BURL_MRDOCS_BUILD)
set(BOOST_BURL_UNIT_TEST_LIBRARIES)
endif ()
if (BOOST_BURL_BUILD_EXAMPLES)
set(BOOST_BURL_EXAMPLE_LIBRARIES)
set(BOOST_BURL_EXAMPLE_LIBRARIES hash2)
endif ()
endif ()
# Complete dependency list (only set when burl is the root project)
Expand Down Expand Up @@ -188,6 +188,13 @@ add_library(boost_burl ${BOOST_BURL_HEADERS} ${BOOST_BURL_SOURCES})
add_library(Boost::burl ALIAS boost_burl)
boost_burl_setup_properties(boost_burl)

list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
find_package(Libpsl)
if (Libpsl_FOUND)
target_link_libraries(boost_burl PRIVATE Libpsl::Libpsl)
target_compile_definitions(boost_burl PRIVATE BURL_HAS_LIBPSL)
endif ()

#-------------------------------------------------
#
# Tests
Expand Down
10 changes: 0 additions & 10 deletions CMakePresets.json

This file was deleted.

33 changes: 33 additions & 0 deletions cmake/FindLibpsl.cmake
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
#
# Copyright (c) 2025 Mohammad Nejati
#
# Distributed under the Boost Software License, Version 1.0. (See accompanying
# file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
#
# Official repository: https://github.com/cppalliance/beast2
#

# Provides imported targets:
# Libpsl::Libpsl

find_path(Libpsl_INCLUDE_DIR NAMES libpsl.h)
find_library(Libpsl_LIBRARY NAMES psl libpsl)

include(FindPackageHandleStandardArgs)
find_package_handle_standard_args(Libpsl
REQUIRED_VARS
Libpsl_INCLUDE_DIR
Libpsl_LIBRARY
)

if(Libpsl_FOUND)
add_library(Libpsl::Libpsl UNKNOWN IMPORTED)
set_target_properties(Libpsl::Libpsl PROPERTIES
IMPORTED_LOCATION "${Libpsl_LIBRARY}"
INTERFACE_INCLUDE_DIRECTORIES "${Libpsl_INCLUDE_DIR}"
)
endif()

mark_as_advanced(
Libpsl_INCLUDE_DIR
Libpsl_LIBRARY)
Loading
Loading