Merge branch 'develop'

.appveyor.yml

@@ -143,7 +143,7 @@ environment:
       CXXSTD: 14
       GENERATOR: Visual Studio 14 2015 Win64
       configuration: Debug
-      BOOST_ROOT: C:\Libraries\boost_1_60_0
+      BOOST_ROOT: C:\Libraries\boost_1_66_0
     - CMAKE: true
       APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2022
       CXXSTD: 17
@@ -151,7 +151,7 @@ environment:
       CMAKE_FLAGS: -DBOOST_NOWIDE_DISABLE_CIN_TEST=ON
       GENERATOR: Visual Studio 17 2022
       configuration: Debug
-      BOOST_ROOT: C:\Libraries\boost_1_83_0
+      BOOST_ROOT: C:\Libraries\boost_1_89_0
 
     # Coverity
     - COVERITY: true

.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
@@ -97,9 +97,7 @@ jobs:
           fi
         else
           toolset=gcc
-          [[ "${{matrix.os}}" =~ "windows" ]] && botstrap_toolset=mingw || botstrap_toolset=gcc
-          ./bootstrap.sh --with-toolset="$botstrap_toolset" --with-libraries=system,filesystem threading=multi || (cat bootstrap.log && false)
-          sed -i 's/mingw/gcc/' project-config.jam
+          ./bootstrap.sh --with-toolset=$toolset --with-libraries=system,filesystem threading=multi || (cat bootstrap.log && false)
           ./b2 headers
         fi
         echo "B2_TOOLSET=$toolset" >> $GITHUB_ENV
@@ -147,7 +145,8 @@ jobs:
         extraFlags="-DBoost_DEBUG=ON -DBoost_NO_BOOST_CMAKE=ON -DCMAKE_INSTALL_PREFIX=$HOME/local"
         if ! [[ "${{matrix.generator}}" =~ "Visual Studio" ]]; then
           # Enable warning to find missing defines, especially important for the standalone version
-          extraFlags="$extraFlags -DCMAKE_CXX_FLAGS=-Wundef"
+          extraFlags+=" -DCMAKE_CXX_FLAGS=-Wundef"
+          extraFlags+=" -DBoost_ARCHITECTURE=-x64" # ABI tag for MinGW
         fi
         cmake -DCMAKE_BUILD_TYPE=${{matrix.buildType}} -DBUILD_SHARED_LIBS=${{matrix.shared_lib}} -G "${{matrix.generator}}" $extraFlags ..
     - name: Build

.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

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()

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")

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)

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

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)
 endif()
 
 # In some environments this test (part) may fail, so allow to disable it