From ec0717cd1cf3252e11aea5c3f771f9a3d83c074e Mon Sep 17 00:00:00 2001 From: Scott M Anderson Date: Sat, 27 Sep 2025 12:01:32 -0600 Subject: [PATCH 1/5] externpro 25.05.1-84-g2aba57e --- .devcontainer | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.devcontainer b/.devcontainer index 94b749dffb12..2aba57e384fb 160000 --- a/.devcontainer +++ b/.devcontainer @@ -1 +1 @@ -Subproject commit 94b749dffb12869f5f9872eab40b4b21fa9d0285 +Subproject commit 2aba57e384fbe0412b8b4a32636d8c64a52babfe From ab09e9e940f997f781454750b26e8d1b94479420 Mon Sep 17 00:00:00 2001 From: Scott M Anderson Date: Sat, 27 Sep 2025 12:08:00 -0600 Subject: [PATCH 2/5] build with newer clang * issue https://github.com/externpro/externpro/issues/202#issuecomment-3326271255 --- .gitmodules | 4 ++-- libs/mpl | 2 +- libs/numeric/conversion | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.gitmodules b/.gitmodules index 25984c10a914..ae6d5d1904ad 100644 --- a/.gitmodules +++ b/.gitmodules @@ -180,7 +180,7 @@ branch = . [submodule "numeric_conversion"] path = libs/numeric/conversion - url = https://github.com/boostorg/numeric_conversion.git + url = https://github.com/externpro/numeric_conversion.git fetchRecurseSubmodules = on-demand branch = . [submodule "lambda"] @@ -190,7 +190,7 @@ branch = . [submodule "mpl"] path = libs/mpl - url = https://github.com/boostorg/mpl.git + url = https://github.com/externpro/mpl.git fetchRecurseSubmodules = on-demand branch = . [submodule "typeof"] diff --git a/libs/mpl b/libs/mpl index f3464e3ef7d8..9f25d0a26726 160000 --- a/libs/mpl +++ b/libs/mpl @@ -1 +1 @@ -Subproject commit f3464e3ef7d85ef8941d431f3ebaffe51335947b +Subproject commit 9f25d0a26726ffe3f95dab406b666ebe275e1b03 diff --git a/libs/numeric/conversion b/libs/numeric/conversion index 07d5e56494de..acc7ec857f14 160000 --- a/libs/numeric/conversion +++ b/libs/numeric/conversion @@ -1 +1 @@ -Subproject commit 07d5e56494deffd25ac0e46fabc645b3b2a01873 +Subproject commit acc7ec857f14796c57d45f3dbf4e2634104b7b0c From 52e3105687476da68d8382364d1040a8b61d4b23 Mon Sep 17 00:00:00 2001 From: Scott M Anderson Date: Sat, 27 Sep 2025 12:11:40 -0600 Subject: [PATCH 3/5] boost_install: vc143 support backport commits * issue https://github.com/externpro/externpro/issues/202#issuecomment-3336416040 --- tools/boost_install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/boost_install b/tools/boost_install index fa87ef6b6e87..bf2a16827ca7 160000 --- a/tools/boost_install +++ b/tools/boost_install @@ -1 +1 @@ -Subproject commit fa87ef6b6e87e608e73893e33d54e0077f7d0340 +Subproject commit bf2a16827ca7424246f98995fda67f56dab25b3f From 2f2673c8b6e4668ce0c7e69123496d5b5bc619a2 Mon Sep 17 00:00:00 2001 From: Scott M Anderson Date: Sat, 27 Sep 2025 12:14:55 -0600 Subject: [PATCH 4/5] xpbuild: cmake-workflow-preset Release --- .github/workflows/xpbuild.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/xpbuild.yml b/.github/workflows/xpbuild.yml index 151d481d21c2..fb5575822199 100644 --- a/.github/workflows/xpbuild.yml +++ b/.github/workflows/xpbuild.yml @@ -9,22 +9,22 @@ jobs: linux: uses: externpro/externpro/.github/workflows/build-linux.yml@25.05.1 with: - cmake-workflow-preset: Linux + cmake-workflow-preset: LinuxRelease runon: ubuntu-latest secrets: inherit linux-arm64: uses: externpro/externpro/.github/workflows/build-linux.yml@25.05.1 with: - cmake-workflow-preset: Linux + cmake-workflow-preset: LinuxRelease runon: ubuntu-24.04-arm secrets: inherit macos: uses: externpro/externpro/.github/workflows/build-macos.yml@25.05.1 with: - cmake-workflow-preset: Darwin + cmake-workflow-preset: DarwinRelease secrets: inherit windows: uses: externpro/externpro/.github/workflows/build-windows.yml@25.05.1 with: - cmake-workflow-preset: Windows + cmake-workflow-preset: WindowsRelease secrets: inherit From 1695b898b851401ef19e1e4425f998431bb782e9 Mon Sep 17 00:00:00 2001 From: Scott M Anderson Date: Sat, 27 Sep 2025 12:15:55 -0600 Subject: [PATCH 5/5] externpro devel package --- .gitmodules | 2 +- CMakeLists.txt | 5 +++-- tools/cmake | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.gitmodules b/.gitmodules index ae6d5d1904ad..bfb677862cdf 100644 --- a/.gitmodules +++ b/.gitmodules @@ -745,7 +745,7 @@ branch = . [submodule "cmake"] path = tools/cmake - url = https://github.com/boostorg/cmake.git + url = https://github.com/externpro/cmake.git fetchRecurseSubmodules = on-demand branch = . [submodule "static_string"] diff --git a/CMakeLists.txt b/CMakeLists.txt index b243f6f7c392..df8324839f58 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,8 +2,9 @@ # 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 -cmake_minimum_required(VERSION 3.5...3.16) +cmake_minimum_required(VERSION 3.5...3.31) +set(CMAKE_PROJECT_TOP_LEVEL_INCLUDES .devcontainer/cmake/xproinc.cmake) project(Boost VERSION 1.76.0 LANGUAGES CXX) set(BOOST_SUPERPROJECT_VERSION ${PROJECT_VERSION}) @@ -11,4 +12,4 @@ set(BOOST_SUPERPROJECT_SOURCE_DIR ${PROJECT_SOURCE_DIR}) list(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/tools/cmake/include) -include(BoostRoot) +include(xpboost) diff --git a/tools/cmake b/tools/cmake index efbbc015ba9d..ffb2c9c649d4 160000 --- a/tools/cmake +++ b/tools/cmake @@ -1 +1 @@ -Subproject commit efbbc015ba9de6367880a6a1e0e1ce0dd52fe371 +Subproject commit ffb2c9c649d447cab08b370c79555c6dd4141f69