From 18271f83090816023a464c6139a4e38490bddcfa Mon Sep 17 00:00:00 2001 From: ReenigneArcher <42013603+ReenigneArcher@users.noreply.github.com> Date: Sun, 22 Nov 2026 09:40:19 -0500 Subject: [PATCH] fix(build): backport Boost.Locale support for CMake 4.5 --- package-lock.cmake | 7 +++++++ patches/boost-locale-cmake-4.5.patch | 11 +++++++++++ 2 files changed, 18 insertions(+) create mode 100644 patches/boost-locale-cmake-4.5.patch diff --git a/package-lock.cmake b/package-lock.cmake index 9940bb09b11..23ed6d595b1 100644 --- a/package-lock.cmake +++ b/package-lock.cmake @@ -19,11 +19,18 @@ set(PATCH_DIRECTORY "${CMAKE_CURRENT_LIST_DIR}/patches") set(BOOST_TAG boost-1.92.0) set(BOOST_SHA256 9bed76128d4e46755dbe818487788c6fceb6f72b378f4daa49b7e1e600d9088d) string(REGEX REPLACE "^boost-" "" BOOST_VERSION "${BOOST_TAG}") +set(BOOST_PATCH_ARGS) +if(NOT WIN32 AND CMAKE_VERSION VERSION_GREATER_EQUAL "4.5" AND BOOST_TAG STREQUAL "boost-1.92.0") + # Backport the Boost.Locale source grouping fix for CMake 4.5. + # https://github.com/boostorg/locale/pull/273 + set(BOOST_PATCH_ARGS PATCHES "${PATCH_DIRECTORY}/boost-locale-cmake-4.5.patch") +endif() CPMDeclarePackage(Boost NAME Boost VERSION ${BOOST_VERSION} URL https://github.com/boostorg/boost/releases/download/${BOOST_TAG}/${BOOST_TAG}-cmake.tar.xz URL_HASH SHA256=${BOOST_SHA256} + ${BOOST_PATCH_ARGS} DOWNLOAD_ONLY YES ) diff --git a/patches/boost-locale-cmake-4.5.patch b/patches/boost-locale-cmake-4.5.patch new file mode 100644 index 00000000000..3b6c41c7510 --- /dev/null +++ b/patches/boost-locale-cmake-4.5.patch @@ -0,0 +1,11 @@ +diff --git a/libs/locale/CMakeLists.txt b/libs/locale/CMakeLists.txt +--- a/libs/locale/CMakeLists.txt ++++ b/libs/locale/CMakeLists.txt +@@ -232,6 +232,7 @@ set(sources_src ${sources}) + list(FILTER sources_src INCLUDE REGEX "^src/") + set(sources_inc ${sources}) + list(FILTER sources_inc EXCLUDE REGEX "^src/") ++list(REMOVE_ITEM sources_inc "${CMAKE_CURRENT_SOURCE_DIR}/include/boost/locale.hpp") + source_group(TREE "${CMAKE_CURRENT_SOURCE_DIR}/src" PREFIX "sources" FILES ${sources_src}) + source_group(TREE "${CMAKE_CURRENT_SOURCE_DIR}/include/boost/locale" PREFIX "headers" FILES ${sources_inc}) + source_group("headers" FILES "include/boost/locale.hpp")