Correct CMake version check; VERSION_GREATER 3.18 is true for 3.18.1

Remove windows-2019 from ci.yml
Switch Boost.System to header-only in b2
2025-12-31 02:58:10 +01:00 · 2025-10-19 21:04:45 +03:00 · 2025-07-02 19:12:29 +03:00 · 2025-06-26 16:37:21 +03:00 · 2025-06-26 15:59:21 +03:00
5 changed files with 45 additions and 87 deletions
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -19,33 +19,36 @@ jobs:
        include:
          - toolset: gcc-4.8
            cxxstd: "11"
-            os: ubuntu-latest
            container: ubuntu:18.04
+            os: ubuntu-latest
            install: g++-4.8
          - toolset: gcc-5
            cxxstd: "11,14,1z"
-            os: ubuntu-latest
            container: ubuntu:18.04
+            os: ubuntu-latest
            install: g++-5
          - toolset: gcc-6
            cxxstd: "11,14,1z"
-            os: ubuntu-latest
            container: ubuntu:18.04
+            os: ubuntu-latest
            install: g++-6
          - toolset: gcc-7
            cxxstd: "11,14,17"
-            os: ubuntu-latest
            container: ubuntu:18.04
+            os: ubuntu-latest
          - toolset: gcc-8
            cxxstd: "11,14,17,2a"
-            os: ubuntu-20.04
+            container: ubuntu:20.04
+            os: ubuntu-latest
            install: g++-8
          - toolset: gcc-9
            cxxstd: "11,14,17,2a"
-            os: ubuntu-20.04
+            container: ubuntu:20.04
+            os: ubuntu-latest
          - toolset: gcc-10
            cxxstd: "11,14,17,2a"
-            os: ubuntu-20.04
+            container: ubuntu:20.04
+            os: ubuntu-latest
            install: g++-10
          - toolset: gcc-11
            cxxstd: "11,14,17,2a"
@@ -64,6 +67,11 @@ jobs:
            os: ubuntu-latest
            container: ubuntu:24.04
            install: g++-14
+          - toolset: gcc-15
+            cxxstd: "11,14,17,20,23,2c"
+            os: ubuntu-latest
+            container: ubuntu:25.04
+            install: g++-15
          - toolset: clang
            compiler: clang++-3.9
            cxxstd: "11,14"
@@ -85,35 +93,45 @@ jobs:
          - toolset: clang
            compiler: clang++-6.0
            cxxstd: "11,14,17"
-            os: ubuntu-20.04
+            container: ubuntu:20.04
+            os: ubuntu-latest
            install: clang-6.0
          - toolset: clang
            compiler: clang++-7
            cxxstd: "11,14,17"
-            os: ubuntu-20.04
+            container: ubuntu:20.04
+            os: ubuntu-latest
            install: clang-7
          - toolset: clang
            compiler: clang++-8
            cxxstd: "11,14,17"
-            os: ubuntu-20.04
+            container: ubuntu:20.04
+            os: ubuntu-latest
            install: clang-8
          - toolset: clang
            compiler: clang++-9
            cxxstd: "11,14,17"
-            os: ubuntu-20.04
+            container: ubuntu:20.04
+            os: ubuntu-latest
            install: clang-9
          - toolset: clang
            compiler: clang++-10
            cxxstd: "11,14,17,2a"
-            os: ubuntu-20.04
+            container: ubuntu:20.04
+            os: ubuntu-latest
+            install: clang-10
          - toolset: clang
            compiler: clang++-11
            cxxstd: "11,14,17,2a"
-            os: ubuntu-20.04
+            container: ubuntu:20.04
+            os: ubuntu-latest
+            install: clang-11
          - toolset: clang
            compiler: clang++-12
            cxxstd: "11,14,17,20"
-            os: ubuntu-20.04
+            container: ubuntu:20.04
+            os: ubuntu-latest
+            install: clang-12
          - toolset: clang
            compiler: clang++-13
            cxxstd: "11,14,17,20,2b"
@@ -153,9 +171,15 @@ jobs:
          - toolset: clang
            compiler: clang++-19
            cxxstd: "11,14,17,20,2b"
-            container: ubuntu:24.10
+            container: ubuntu:24.04
            os: ubuntu-latest
            install: clang-19
+          - toolset: clang
+            compiler: clang++-20
+            cxxstd: "11,14,17,20,23,2c"
+            container: ubuntu:25.04
+            os: ubuntu-latest
+            install: clang-20
          - toolset: clang
            cxxstd: "11,14,17,20,2b"
            os: macos-13
@@ -237,14 +261,6 @@ jobs:
      fail-fast: false
      matrix:
        include:
-          - toolset: msvc-14.0
-            cxxstd: "14"
-            addrmd: 32,64
-            os: windows-2019
-          - toolset: msvc-14.2
-            cxxstd: "14,17,20,latest"
-            addrmd: 32,64
-            os: windows-2019
          - toolset: msvc-14.3
            cxxstd: "14,17,20,latest"
            addrmd: 32,64
@@ -256,7 +272,7 @@ jobs:
          - toolset: gcc
            cxxstd: "11,14,17,2a"
            addrmd: 64
-            os: windows-2019
+            os: windows-2022

    runs-on: ${{matrix.os}}

@@ -296,7 +312,6 @@ jobs:
      fail-fast: false
      matrix:
        include:
-          - os: ubuntu-20.04
          - os: ubuntu-22.04
          - os: ubuntu-24.04
          - os: macos-13
@@ -345,7 +360,6 @@ jobs:
      fail-fast: false
      matrix:
        include:
-          - os: ubuntu-20.04
          - os: ubuntu-22.04
          - os: ubuntu-24.04
          - os: macos-13
@@ -404,7 +418,6 @@ jobs:
      fail-fast: false
      matrix:
        include:
-          - os: ubuntu-20.04
          - os: ubuntu-22.04
          - os: ubuntu-24.04
          - os: macos-13
@@ -461,8 +474,7 @@ jobs:
      fail-fast: false
      matrix:
        include:
-          - os: windows-2019
-          - os: windows-2022
+          - os: windows-latest

    runs-on: ${{matrix.os}}

@@ -510,8 +522,7 @@ jobs:
      fail-fast: false
      matrix:
        include:
-          - os: windows-2019
-          - os: windows-2022
+          - os: windows-latest

    runs-on: ${{matrix.os}}

@@ -577,8 +588,7 @@ jobs:
      fail-fast: false
      matrix:
        include:
-          - os: windows-2019
-          - os: windows-2022
+          - os: windows-latest

    runs-on: ${{matrix.os}}

--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -22,7 +22,7 @@ target_link_libraries(boost_system

 target_compile_features(boost_system INTERFACE cxx_std_11)

-if(CMAKE_VERSION VERSION_GREATER 3.18 AND CMAKE_GENERATOR MATCHES "Visual Studio")
+if(NOT CMAKE_VERSION VERSION_LESS 3.19 AND CMAKE_GENERATOR MATCHES "Visual Studio")

  file(GLOB_RECURSE boost_system_IDEFILES CONFIGURE_DEPENDS include/*.hpp)
  source_group(TREE ${PROJECT_SOURCE_DIR}/include FILES ${boost_system_IDEFILES} PREFIX "Header Files")
--- a/build.jam
+++ b/build.jam
@@ -16,10 +16,9 @@ constant boost_dependencies :
 project /boost/system ;

 explicit
-    [ alias boost_system : build//boost_system ]
+    [ alias boost_system : : : : <include>include <library>$(boost_dependencies) ]
    [ alias all : boost_system test ]
    ;

 call-if : boost-library system
-    : install boost_system
    ;
--- a/build/Jamfile.v2
+++ b/build/Jamfile.v2
@@ -1,20 +0,0 @@
-# Boost System Library Build Jamfile
-# Copyright 2002, 2006 Beman Dawes
-# Copyright 2024 Peter Dimov
-# Distributed under the Boost Software License, Version 1.0.
-# https://www.boost.org/LICENSE_1_0.txt
-
-# See library home page at https://www.boost.org/libs/system
-
-project
-    : common-requirements
-      <include>../include
-      <library>$(boost_dependencies)
-      <link>shared:<define>BOOST_SYSTEM_DYN_LINK=1
-      <link>static:<define>BOOST_SYSTEM_STATIC_LINK=1
-      <define>BOOST_SYSTEM_NO_LIB=1
-    ;
-
-SOURCES = error_code ;
-
-lib boost_system : ../src/$(SOURCES).cpp ;
--- a/src/error_code.cpp
+++ b/src/error_code.cpp
@@ -1,31 +0,0 @@
-//  error_code stub implementation, for compatibility only
-
-//  Copyright Beman Dawes 2002, 2006
-//  Copyright Peter Dimov 2018
-
-//  Distributed under the Boost Software License, Version 1.0. (See accompanying
-//  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-
-//  See library home page at http://www.boost.org/libs/system
-
-//----------------------------------------------------------------------------//
-
-// define BOOST_SYSTEM_SOURCE so that <boost/system/config.hpp> knows
-// the library is being built (possibly exporting rather than importing code)
-#define BOOST_SYSTEM_SOURCE
-
-#include <boost/system/config.hpp>
-
-namespace boost
-{
-
-namespace system
-{
-
-BOOST_SYSTEM_DECL void dummy_exported_function()
-{
-}
-
-} // namespace system
-
-} // namespace boost
Author	SHA1	Message	Date
Peter Dimov	bd46fb21f3	Correct CMake version check; VERSION_GREATER 3.18 is true for 3.18.1	2025-10-19 21:04:45 +03:00
Peter Dimov	14c5f52602	Remove windows-2019 from ci.yml	2025-07-02 19:12:29 +03:00
Peter Dimov	7a495bb46d	Switch Boost.System to header-only in b2	2025-06-26 16:37:21 +03:00
Peter Dimov	db00e1848e	Update ci.yml	2025-06-26 15:59:21 +03:00