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.

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

Improve C++11 support #119

Merged
merged 18 commits into from
Jan 18, 2025
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
2 changes: 2 additions & 0 deletions .clang-format
Original file line number Diff line number Diff line change
Expand Up @@ -25,4 +25,6 @@ BraceWrapping:
AllowAllConstructorInitializersOnNextLine: true
ConstructorInitializerAllOnOneLineOrOnePerLine: true
AllowShortCaseLabelsOnASingleLine: true
IfMacros:
- RAPIDFUZZ_IF_CONSTEXPR
IndentPPDirectives: AfterHash
134 changes: 134 additions & 0 deletions .github/workflows/linux-simple.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,134 @@
name: Linux builds (basic)

on: [push, pull_request]

jobs:
build:
name: ${{matrix.cxx}}, C++${{matrix.std}}, ${{matrix.build_type}}
runs-on: ubuntu-20.04
strategy:
fail-fast: false
matrix:
compiler:
- g++-5
- g++-6
- g++-7
- g++-8
- g++-9
- g++-10
- clang++-6.0
- clang++-7
- clang++-8
- clang++-9
- clang++-10
build_type: [Debug, Release]
std: [11]
include:
- cxx: g++-5
other_pkgs: g++-5
- cxx: g++-6
other_pkgs: g++-6
- cxx: g++-7
other_pkgs: g++-7
- cxx: g++-8
other_pkgs: g++-8
- cxx: g++-9
other_pkgs: g++-9
- cxx: g++-10
other_pkgs: g++-10
- cxx: clang++-6.0
other_pkgs: clang-6.0
- cxx: clang++-7
other_pkgs: clang-7
- cxx: clang++-8
other_pkgs: clang-8
- cxx: clang++-9
other_pkgs: clang-9
- cxx: clang++-10
other_pkgs: clang-10

- cxx: clang++-10
other_pkgs: clang-10
std: 14
build_type: Debug
- cxx: clang++-10
other_pkgs: clang-10
std: 17
build_type: Debug
- cxx: clang++-10
other_pkgs: clang-10
std: 20
build_type: Debug
- cxx: g++-10
other_pkgs: g++-10
std: 14
build_type: Debug
- cxx: g++-10
other_pkgs: g++-10
std: 17
build_type: Debug
- cxx: g++-10
other_pkgs: g++-10
std: 20
build_type: Debug

- cxx: clang++-10
other_pkgs: clang-10
std: 14
build_type: Release
- cxx: clang++-10
other_pkgs: clang-10
std: 17
build_type: Release
- cxx: clang++-10
other_pkgs: clang-10
std: 20
build_type: Release
- cxx: g++-10
other_pkgs: g++-10
std: 14
build_type: Release
- cxx: g++-10
other_pkgs: g++-10
std: 17
build_type: Release
- cxx: g++-10
other_pkgs: g++-10
std: 20
build_type: Release

steps:
- uses: actions/checkout@v4

- name: Add repositories for older GCC
run: |
sudo apt-add-repository 'deb http://azure.archive.ubuntu.com/ubuntu/ bionic main'
sudo apt-add-repository 'deb http://azure.archive.ubuntu.com/ubuntu/ bionic universe'
if: ${{ matrix.cxx == 'g++-5' || matrix.cxx == 'g++-6' }}

- name: Prepare environment
run: |
sudo apt-get update
sudo apt-get install -y ninja-build ${{matrix.other_pkgs}}

- name: Configure CMake
env:
CXX: ${{matrix.cxx}}
run: |
cmake -B build \
-DCMAKE_BUILD_TYPE=${{matrix.build_type}} \
-DCMAKE_CXX_STANDARD=${{matrix.std}} \
-DCMAKE_CXX_STANDARD_REQUIRED=ON \
-DCMAKE_CXX_EXTENSIONS=OFF \
-DRAPIDFUZZ_BUILD_TESTING=1 \
-DRAPIDFUZZ_ENABLE_LINTERS=1 \
-G Ninja

- name: Build
working-directory: build
run: ninja

- name: Test
working-directory: build
run: ctest -C ${{matrix.build_type}} --rerun-failed --output-on-failure -j `nproc`

4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
## Changelog

## [3.3.0] - 2025-01-18
### Changed
- add C++11 and C++14 support

## [3.2.0] - 2024-12-17
### Performance
- improve calculation of min score inside partial_ratio so it can skip more alignments
Expand Down
4 changes: 2 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ if (CMAKE_BINARY_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR)
message(FATAL_ERROR "Building in-source is not supported! Create a build dir and remove ${CMAKE_SOURCE_DIR}/CMakeCache.txt")
endif()

project(rapidfuzz LANGUAGES CXX VERSION 3.2.0)
project(rapidfuzz LANGUAGES CXX VERSION 3.3.0)

list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/cmake")
include(GNUInstallDirs)
Expand All @@ -50,7 +50,7 @@ add_library(rapidfuzz INTERFACE)
# provide a namespaced alias for clients to 'link' against if RapidFuzz is included as a sub-project
add_library(rapidfuzz::rapidfuzz ALIAS rapidfuzz)

target_compile_features(rapidfuzz INTERFACE cxx_std_17)
target_compile_features(rapidfuzz INTERFACE cxx_std_11)

target_include_directories(rapidfuzz
INTERFACE
Expand Down
Loading
Loading