Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions package-lock.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -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
)

Expand Down
11 changes: 11 additions & 0 deletions patches/boost-locale-cmake-4.5.patch
Original file line number Diff line number Diff line change
@@ -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")
Loading