Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

cmake: use upstream BoostConfig.cmake unconditionally #218

Merged
merged 2 commits into from
Feb 20, 2025
Merged

cmake: use upstream BoostConfig.cmake unconditionally #218

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9878741
cmake: use upstream BoostConfig.cmake unconditionally
lzaoral Feb 5, 2025
ebea65c
ci: add Ubuntu 24.04 jobs
lzaoral Feb 5, 2025
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
8 changes: 5 additions & 3 deletions .github/workflows/ubuntu.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@ on:

jobs:
ubuntu:
name: Ubuntu ${{ matrix.version }} (${{ matrix.compiler }}${{ matrix.version == 22.04 && ' with sanitizers' || '' }})
name: Ubuntu ${{ matrix.version }} (${{ matrix.compiler }}${{ matrix.version == 24.04 && ' with sanitizers' || '' }})
strategy:
fail-fast: false
matrix:
compiler: [clang++, g++]
version: [20.04, 22.04]
version: [20.04, 22.04, 24.04]

runs-on: ubuntu-${{ matrix.version }}
env:
Expand All @@ -39,7 +39,9 @@ jobs:

- name: Build and check
run: |
if [[ "${{ matrix.version }}" == 22.04 ]]; then
if [[ "${{ matrix.version }}" == 24.04 ]]; then
# -Werror causes false positives with sanitizers and modern GCC
[[ "${{ matrix.compiler }}" == g++ ]] && export CXXFLAGS=
make distcheck-sanitizers
else
make distcheck
Expand Down
5 changes: 3 additions & 2 deletions src/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,8 @@ if(SANITIZERS)
endif()

# find Boost
find_package(Boost REQUIRED
set(Boost_VERBOSE TRUE)
find_package(Boost CONFIG REQUIRED
COMPONENTS filesystem
program_options
regex
Expand Down Expand Up @@ -126,7 +127,7 @@ macro(build_pycsdiff version)

# find boost_python${version}
set(PYTHON_VERSION_SUFFIX "${version}${Python${version}_VERSION_MINOR}")
find_package(Boost REQUIRED COMPONENTS python${PYTHON_VERSION_SUFFIX})
find_package(Boost CONFIG REQUIRED COMPONENTS python${PYTHON_VERSION_SUFFIX})
message(STATUS "Python ${version} binding enabled. "
"The pycsdiff module will be built!")

Expand Down
Loading