From 0768ece5cc1a7ec29329bbcdf8942afd1e377bdf Mon Sep 17 00:00:00 2001 From: Alexander Grund Date: Thu, 23 Oct 2025 11:32:01 +0200 Subject: [PATCH] Update required Boost version to 1.66 B2 doesn't build on some newer compilers anymore so we can't properly test it. As 1.66 is "old enough" by now just use that. --- .github/workflows/ci_tests.yml | 6 +++--- .github/workflows/release.yml | 2 +- CMakeLists.txt | 2 +- Config.cmake.in | 2 +- README.md | 2 +- doc/changelog.dox | 5 ++++- test/CMakeLists.txt | 2 +- 7 files changed, 12 insertions(+), 9 deletions(-) diff --git a/.github/workflows/ci_tests.yml b/.github/workflows/ci_tests.yml index 64c01e4..7601df6 100644 --- a/.github/workflows/ci_tests.yml +++ b/.github/workflows/ci_tests.yml @@ -53,7 +53,7 @@ jobs: DEP_DIR: ${{github.workspace}}/dependencies # VS 2022 only supported by Boost.Build 1.78+ with changes to build files (e.g. in Boost.Thread) required that are introduced in Boost 1.66 # Boost.Iostreams doesn't support VS 2022 until 1.69 - BOOST_VERSION: ${{ startsWith(matrix.generator, 'Visual Studio') && '1.69.0' || '1.56.0' }} + BOOST_VERSION: ${{ startsWith(matrix.generator, 'Visual Studio') && '1.69.0' || '1.66.0' }} steps: - uses: actions/checkout@v4 - name: Sanity check version @@ -83,11 +83,11 @@ jobs: if: matrix.standalone == 'Boost' && steps.cache-boost.outputs.cache-hit != 'true' working-directory: __buildBoost run: | - git submodule update --init --jobs 3 tools/boostdep libs/filesystem tools/inspect libs/wave # Last 2 are required for pre-1.64 + git submodule update --init --jobs 3 tools/boostdep libs/filesystem if [[ $BOOST_VERSION < '1.73.0' ]]; then (cd tools/boostdep && git fetch origin && git checkout boost-1.73.0 && git checkout boost-1.63.0 -- depinst/exceptions.txt) fi - python tools/boostdep/depinst/depinst.py --include tools --exclude test --git_args '--jobs 3 --depth 1' wave # Should be filesystem, but works because that is a dependency of wave + python tools/boostdep/depinst/depinst.py --include tools --exclude test --git_args '--jobs 3 --depth 1' filesystem if [[ "${{matrix.generator}}" =~ "Visual Studio" ]]; then toolset=msvc-14.3 # Boost.Build doesn't support MSVC 2022 (14.3) until 1.78 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index c4a9afe..7bca439 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -16,7 +16,7 @@ jobs: runs-on: ubuntu-latest env: DEP_DIR: ${{github.workspace}}/dependencies - BOOST_VERSION: 1.56.0 + BOOST_VERSION: 1.66.0 steps: - uses: actions/checkout@v4 - name: Extract tag name diff --git a/CMakeLists.txt b/CMakeLists.txt index a4f4656..100bd05 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -91,7 +91,7 @@ else() if(WIN32 AND NOT DEFINED Boost_USE_STATIC_LIBS) set(Boost_USE_STATIC_LIBS ON) endif() - find_package(Boost 1.56 REQUIRED) + find_package(Boost 1.66 REQUIRED) endif() target_link_libraries(boost_nowide PUBLIC Boost::boost) endif() diff --git a/Config.cmake.in b/Config.cmake.in index bed281c..5a610aa 100644 --- a/Config.cmake.in +++ b/Config.cmake.in @@ -8,7 +8,7 @@ foreach(dep IN ITEMS boost_config) find_dependency(${dep}) endforeach() else() -find_dependency(Boost 1.56) +find_dependency(Boost 1.66) endif() include("${CMAKE_CURRENT_LIST_DIR}/@PROJECT_NAME@Targets.cmake") diff --git a/README.md b/README.md index 27a22a7..a0be747 100644 --- a/README.md +++ b/README.md @@ -36,7 +36,7 @@ This is different to the version available prior to the inclusion in Boost. ### Requirements (Boost version) -* Boost (>= 1.56) +* Boost (>= 1.66) * CMake (when not using as part of Boost) or B2 (otherwise) ### Requirements (Standalone version) diff --git a/doc/changelog.dox b/doc/changelog.dox index 56cc560..95f1b3b 100644 --- a/doc/changelog.dox +++ b/doc/changelog.dox @@ -1,5 +1,5 @@ // -// Copyright (c) 2019-2024 Alexander Grund +// Copyright (c) 2019-2025 Alexander Grund // // Distributed under the Boost Software License, Version 1.0. // https://www.boost.org/LICENSE_1_0.txt @@ -8,6 +8,9 @@ \section changelog Changelog +\subsection changelog_11_4_1 Nowide 11.4.1 (Boost 1.89) +- Require at least Boost 1.66 + \subsection changelog_11_3_1 Nowide 11.3.1 (Boost 1.88) - Fix redefinition of `_CRT_SECURE_NO_WARNINGS` - Make `getenv` thread-safe diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 9565b00..fc4a43b 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -14,7 +14,7 @@ if(NOT TARGET tests) endif() if(NOT BOOST_SUPERPROJECT_SOURCE_DIR) - find_package(Boost 1.56 REQUIRED COMPONENTS filesystem system) + find_package(Boost 1.66 REQUIRED COMPONENTS filesystem system) endif() # In some environments this test (part) may fail, so allow to disable it