mirror of
https://github.com/boostorg/nowide.git
synced 2026-01-19 04:22:12 +00:00
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.
This commit is contained in:
6
.github/workflows/ci_tests.yml
vendored
6
.github/workflows/ci_tests.yml
vendored
@@ -53,7 +53,7 @@ jobs:
|
|||||||
DEP_DIR: ${{github.workspace}}/dependencies
|
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
|
# 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.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:
|
steps:
|
||||||
- uses: actions/checkout@v4
|
- uses: actions/checkout@v4
|
||||||
- name: Sanity check version
|
- name: Sanity check version
|
||||||
@@ -83,11 +83,11 @@ jobs:
|
|||||||
if: matrix.standalone == 'Boost' && steps.cache-boost.outputs.cache-hit != 'true'
|
if: matrix.standalone == 'Boost' && steps.cache-boost.outputs.cache-hit != 'true'
|
||||||
working-directory: __buildBoost
|
working-directory: __buildBoost
|
||||||
run: |
|
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
|
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)
|
(cd tools/boostdep && git fetch origin && git checkout boost-1.73.0 && git checkout boost-1.63.0 -- depinst/exceptions.txt)
|
||||||
fi
|
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
|
if [[ "${{matrix.generator}}" =~ "Visual Studio" ]]; then
|
||||||
toolset=msvc-14.3
|
toolset=msvc-14.3
|
||||||
# Boost.Build doesn't support MSVC 2022 (14.3) until 1.78
|
# Boost.Build doesn't support MSVC 2022 (14.3) until 1.78
|
||||||
|
|||||||
2
.github/workflows/release.yml
vendored
2
.github/workflows/release.yml
vendored
@@ -16,7 +16,7 @@ jobs:
|
|||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
env:
|
env:
|
||||||
DEP_DIR: ${{github.workspace}}/dependencies
|
DEP_DIR: ${{github.workspace}}/dependencies
|
||||||
BOOST_VERSION: 1.56.0
|
BOOST_VERSION: 1.66.0
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v4
|
- uses: actions/checkout@v4
|
||||||
- name: Extract tag name
|
- name: Extract tag name
|
||||||
|
|||||||
@@ -91,7 +91,7 @@ else()
|
|||||||
if(WIN32 AND NOT DEFINED Boost_USE_STATIC_LIBS)
|
if(WIN32 AND NOT DEFINED Boost_USE_STATIC_LIBS)
|
||||||
set(Boost_USE_STATIC_LIBS ON)
|
set(Boost_USE_STATIC_LIBS ON)
|
||||||
endif()
|
endif()
|
||||||
find_package(Boost 1.56 REQUIRED)
|
find_package(Boost 1.66 REQUIRED)
|
||||||
endif()
|
endif()
|
||||||
target_link_libraries(boost_nowide PUBLIC Boost::boost)
|
target_link_libraries(boost_nowide PUBLIC Boost::boost)
|
||||||
endif()
|
endif()
|
||||||
|
|||||||
@@ -8,7 +8,7 @@ foreach(dep IN ITEMS boost_config)
|
|||||||
find_dependency(${dep})
|
find_dependency(${dep})
|
||||||
endforeach()
|
endforeach()
|
||||||
else()
|
else()
|
||||||
find_dependency(Boost 1.56)
|
find_dependency(Boost 1.66)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
include("${CMAKE_CURRENT_LIST_DIR}/@PROJECT_NAME@Targets.cmake")
|
include("${CMAKE_CURRENT_LIST_DIR}/@PROJECT_NAME@Targets.cmake")
|
||||||
|
|||||||
@@ -36,7 +36,7 @@ This is different to the version available prior to the inclusion in Boost.
|
|||||||
|
|
||||||
### Requirements (Boost version)
|
### Requirements (Boost version)
|
||||||
|
|
||||||
* Boost (>= 1.56)
|
* Boost (>= 1.66)
|
||||||
* CMake (when not using as part of Boost) or B2 (otherwise)
|
* CMake (when not using as part of Boost) or B2 (otherwise)
|
||||||
|
|
||||||
### Requirements (Standalone version)
|
### Requirements (Standalone version)
|
||||||
|
|||||||
@@ -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.
|
// Distributed under the Boost Software License, Version 1.0.
|
||||||
// https://www.boost.org/LICENSE_1_0.txt
|
// https://www.boost.org/LICENSE_1_0.txt
|
||||||
@@ -8,6 +8,9 @@
|
|||||||
|
|
||||||
\section changelog Changelog
|
\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)
|
\subsection changelog_11_3_1 Nowide 11.3.1 (Boost 1.88)
|
||||||
- Fix redefinition of `_CRT_SECURE_NO_WARNINGS`
|
- Fix redefinition of `_CRT_SECURE_NO_WARNINGS`
|
||||||
- Make `getenv` thread-safe
|
- Make `getenv` thread-safe
|
||||||
|
|||||||
@@ -14,7 +14,7 @@ if(NOT TARGET tests)
|
|||||||
endif()
|
endif()
|
||||||
|
|
||||||
if(NOT BOOST_SUPERPROJECT_SOURCE_DIR)
|
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()
|
endif()
|
||||||
|
|
||||||
# In some environments this test (part) may fail, so allow to disable it
|
# In some environments this test (part) may fail, so allow to disable it
|
||||||
|
|||||||
Reference in New Issue
Block a user