[stlab-copy-on-write] update to 1.1.0 (#49152)

This commit is contained in:
toge
2025-12-31 08:47:05 +09:00
committed by GitHub
parent d6054bff30
commit 9855f9f4f8
10 changed files with 61 additions and 18 deletions

View File

@@ -0,0 +1,17 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6452b57..6e4e9d4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,11 +1,8 @@
cmake_minimum_required(VERSION 3.24)
-include(cmake/CPM.cmake)
-
# Fetch cpp-library before project()
# Check https://github.com/stlab/cpp-library/releases for the latest version
-CPMAddPackage("gh:stlab/cpp-library@5.0.0")
-include(${cpp-library_SOURCE_DIR}/cpp-library.cmake)
+include(cmake/cpp-library/cpp-library.cmake)
# Enable dependency tracking before project()
cpp_library_enable_dependency_tracking()

View File

@@ -1,13 +1,19 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 41ee6d1..b42fe4e 100644
index 6e4e9d4..79671d3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -71,7 +71,7 @@ install(FILES
)
@@ -10,14 +10,9 @@ cpp_library_enable_dependency_tracking()
# Now declare project
project(copy-on-write)
# Only build tests and examples if this is the top-level project
-if(PROJECT_IS_TOP_LEVEL)
+if(0)
# Add doctest dependency for testing
CPMAddPackage(
NAME doctest
-# Enable testing infrastructure (required for TESTS and EXAMPLES)
-include(CTest)
-
# Let cpp-library handle the project declaration and version detection
cpp_library_setup(
DESCRIPTION "Copy-on-write wrapper for any type"
NAMESPACE stlab
HEADERS copy_on_write.hpp
- EXAMPLES basic_usage_test.cpp
- TESTS copy_on_write_tests.cpp
)

View File

@@ -2,19 +2,29 @@ vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO stlab/copy-on-write
REF "v${VERSION}"
SHA512 14fd31c27a45111050b5b4e7164ef1467cecc0c1b258172d954700a0e0b6ce69cb28b700d5ca145c37974e4fdffe1563e13ea627b6cce11599381d7aa6cd0f54
SHA512 4f480b35a232abd94f70bcd37b93099196e8d09f40678f87afc367af7b11c5799ffaa81ee134e6c1b85f7a5d6765f0a25c305d6dd09685bb1b4bbc3948ecbd3e
HEAD_REF main
PATCHES
disable-cpm.patch
disable-tests.patch
)
# Replace CPM and download cpp-library directly to avoid issues with FETCHCONTENT_FULLY_DISCONNECTED
vcpkg_from_github(
OUT_SOURCE_PATH PACKAGE_PROJECT_PATH
REPO stlab/cpp-library
REF "v5.0.0"
SHA512 5e158dbdcabe698f7ddaff460a68c490978a7f91af8cb90f19430456acc1ca0f115973f149303b07d5ed0fbb3b43cd857b133c46bc6b4e8cc96c1ee25b0e87a9
HEAD_REF master
)
file(RENAME "${PACKAGE_PROJECT_PATH}" "${SOURCE_PATH}/cmake/cpp-library")
set(VCPKG_BUILD_TYPE release) # header-only port
vcpkg_cmake_configure(
SOURCE_PATH "${SOURCE_PATH}"
OPTIONS
${FEATURE_OPTIONS}
-Dstlab-copy-on-write_IS_TOP_LEVEL=OFF
-DBUILD_TESTING=OFF
)
vcpkg_cmake_install()

View File

@@ -1,6 +1,6 @@
{
"name": "stlab-copy-on-write",
"version": "1.0.3",
"version": "1.1.0",
"description": "stlab copy-on-write library",
"homepage": "https://github.com/stlab/copy-on-write",
"license": "BSL-1.0",

View File

@@ -9,7 +9,7 @@ index 671f79d..8eabae4 100644
-CPMAddPackage("gh:stlab/copy-on-write@1.0.3")
-target_link_libraries(stlab INTERFACE stlab::copy-on-write)
+find_package(stlab-copy-on-write CONFIG REQUIRED)
+target_link_libraries(stlab PUBLIC stlab::stlab-copy-on-write)
+target_link_libraries(stlab PUBLIC stlab::copy-on-write)
########################################################
# clangd

View File

@@ -2,7 +2,7 @@ vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO stlab/libraries
REF "v${VERSION}"
SHA512 446ea1337f6700a11f83cc718e9d702a684437b369efa502f8f3bf9097d56a435af4c8bcc95e8684a5e39ef06bb8c624fb3cc9fa45799770b351075c8cc86077
SHA512 9854b93b92dd9fdb468020660c91282a70304a8e99ef07b7c4a6ba348d07c06a4da17531c1162fde64f924ab9c6faadef2b55fc73e1b443e9f8b02838dc66630
HEAD_REF main
PATCHES
cross-build.patch

View File

@@ -1,7 +1,7 @@
{
"name": "stlab",
"version": "2.0.2",
"port-version": 1,
"port-version": 2,
"description": [
"stlab is the ongoing work of what was Adobe Software Technology Lab.",
"The Concurrency library provides futures and channels, high level constructs for implementing algorithms that eases the use of multiple CPU cores while minimizing contention. This library solves several problems of the C++11 and C++17 TS futures."

View File

@@ -9410,10 +9410,10 @@
},
"stlab": {
"baseline": "2.0.2",
"port-version": 1
"port-version": 2
},
"stlab-copy-on-write": {
"baseline": "1.0.3",
"baseline": "1.1.0",
"port-version": 0
},
"stormlib": {

View File

@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "413d8e2a4f721eac97e22f67622f274dc06a6595",
"version": "1.1.0",
"port-version": 0
},
{
"git-tree": "d3e3c51e107be267d2da7c37f81e6ef1f4489dfb",
"version": "1.0.3",

View File

@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "7ad1e754cb563b2804b1fbedfb86b1ce94153a9f",
"version": "2.0.2",
"port-version": 2
},
{
"git-tree": "831304d7a4aa1c40e2a66e42813d8702484b908a",
"version": "2.0.2",