From 90cde79d3251b8de53f08b92f0522702eb8529e0 Mon Sep 17 00:00:00 2001 From: Lukas Senionis Date: Tue, 17 Dec 2024 12:08:23 +0200 Subject: [PATCH 1/4] feat(boost): bump to 1.87 --- cmake/Boost_DD.cmake | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/cmake/Boost_DD.cmake b/cmake/Boost_DD.cmake index 07ac57e..9b19d36 100644 --- a/cmake/Boost_DD.cmake +++ b/cmake/Boost_DD.cmake @@ -12,16 +12,16 @@ set(REQUIRED_HEADER_LIBRARIES uuid ) -find_package(Boost 1.85 CONFIG QUIET GLOBAL) +find_package(Boost 1.87 CONFIG QUIET GLOBAL) if(NOT Boost_FOUND) - message(STATUS "Boost v1.85.x package not found in the system. Falling back to FetchContent.") + message(STATUS "Boost v1.87.x package not found in the system. Falling back to FetchContent.") include(FetchContent) set(BOOST_INCLUDE_LIBRARIES ${REQUIRED_HEADER_LIBRARIES}) FetchContent_Declare( Boost - URL https://github.com/boostorg/boost/releases/download/boost-1.85.0/boost-1.85.0-cmake.tar.xz - URL_HASH MD5=BADEA970931766604D4D5F8F4090B176 + URL https://github.com/boostorg/boost/releases/download/boost-1.87.0/boost-1.87.0-cmake.tar.xz + URL_HASH MD5=D55D43218E81CA3D0FC14436B7665BF1 DOWNLOAD_EXTRACT_TIMESTAMP ) FetchContent_MakeAvailable(Boost) @@ -30,9 +30,10 @@ else() # (differ in linked targets). # Also, FetchContent creates Boost:: targets, whereas find_package does not. Since we cannot extend # Boost::headers as it is an ALIAS target, this is the workaround: + get_target_property(original_headers_target Boost::headers ALIASED_TARGET) foreach (lib ${REQUIRED_HEADER_LIBRARIES}) if (NOT TARGET Boost::${lib}) - add_library(Boost::${lib} ALIAS Boost::headers) + add_library(Boost::${lib} ALIAS ${original_headers_target}) endif () endforeach () endif() From 603c4b86a904f1a2c3ff3311d39f06ee1653baeb Mon Sep 17 00:00:00 2001 From: Lukas Senionis Date: Tue, 17 Dec 2024 12:27:02 +0200 Subject: [PATCH 2/4] OMG FFS --- cmake/Boost_DD.cmake | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/cmake/Boost_DD.cmake b/cmake/Boost_DD.cmake index 9b19d36..0606135 100644 --- a/cmake/Boost_DD.cmake +++ b/cmake/Boost_DD.cmake @@ -30,10 +30,13 @@ else() # (differ in linked targets). # Also, FetchContent creates Boost:: targets, whereas find_package does not. Since we cannot extend # Boost::headers as it is an ALIAS target, this is the workaround: - get_target_property(original_headers_target Boost::headers ALIASED_TARGET) + get_target_property(ORIGINAL_TARGET Boost::headers ALIASED_TARGET) + if (NOT DEFINED ORIGINAL_TARGET-NOTFOUND) + set(ORIGINAL_TARGET Boost::headers) + endif () foreach (lib ${REQUIRED_HEADER_LIBRARIES}) if (NOT TARGET Boost::${lib}) - add_library(Boost::${lib} ALIAS ${original_headers_target}) + add_library(Boost::${lib} ALIAS ${ORIGINAL_TARGET}) endif () endforeach () endif() From de0010f1e284002dfe68a10f3f505fa7e5112c87 Mon Sep 17 00:00:00 2001 From: Lukas Senionis Date: Tue, 17 Dec 2024 12:33:46 +0200 Subject: [PATCH 3/4] GRRRR --- cmake/Boost_DD.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake/Boost_DD.cmake b/cmake/Boost_DD.cmake index 0606135..798cdd5 100644 --- a/cmake/Boost_DD.cmake +++ b/cmake/Boost_DD.cmake @@ -31,7 +31,7 @@ else() # Also, FetchContent creates Boost:: targets, whereas find_package does not. Since we cannot extend # Boost::headers as it is an ALIAS target, this is the workaround: get_target_property(ORIGINAL_TARGET Boost::headers ALIASED_TARGET) - if (NOT DEFINED ORIGINAL_TARGET-NOTFOUND) + if (ORIGINAL_TARGET STREQUAL "ORIGINAL_TARGET-NOTFOUND") set(ORIGINAL_TARGET Boost::headers) endif () foreach (lib ${REQUIRED_HEADER_LIBRARIES}) From 9f24ca70baf3afb6fe77dfc528f5d927dcf2f966 Mon Sep 17 00:00:00 2001 From: Lukas Senionis Date: Tue, 17 Dec 2024 15:29:50 +0200 Subject: [PATCH 4/4] Update Boost_DD.cmake --- cmake/Boost_DD.cmake | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/cmake/Boost_DD.cmake b/cmake/Boost_DD.cmake index 798cdd5..835221b 100644 --- a/cmake/Boost_DD.cmake +++ b/cmake/Boost_DD.cmake @@ -12,16 +12,16 @@ set(REQUIRED_HEADER_LIBRARIES uuid ) -find_package(Boost 1.87 CONFIG QUIET GLOBAL) +find_package(Boost 1.85 CONFIG QUIET GLOBAL) if(NOT Boost_FOUND) - message(STATUS "Boost v1.87.x package not found in the system. Falling back to FetchContent.") + message(STATUS "Boost v1.85.x package not found in the system. Falling back to FetchContent.") include(FetchContent) set(BOOST_INCLUDE_LIBRARIES ${REQUIRED_HEADER_LIBRARIES}) FetchContent_Declare( Boost - URL https://github.com/boostorg/boost/releases/download/boost-1.87.0/boost-1.87.0-cmake.tar.xz - URL_HASH MD5=D55D43218E81CA3D0FC14436B7665BF1 + URL https://github.com/boostorg/boost/releases/download/boost-1.85.0/boost-1.85.0-cmake.tar.xz + URL_HASH MD5=BADEA970931766604D4D5F8F4090B176 DOWNLOAD_EXTRACT_TIMESTAMP ) FetchContent_MakeAvailable(Boost)