mirror of
https://github.com/microsoft/vcpkg.git
synced 2025-01-14 06:53:31 +08:00
[continuable] Update continuable to 4.2.0 (#27640)
* update continuable to upstream 4.2.0 * update versions * perform port update suggestions * fixup hash * Make requested changes * Update hash
This commit is contained in:
parent
250d7a0827
commit
16f2ec1663
@ -1,49 +1,18 @@
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -23,13 +23,6 @@ cmake_minimum_required(VERSION 3.11)
|
||||
|
||||
project(continuable VERSION 4.0.0 LANGUAGES C CXX)
|
||||
|
||||
-if (CTI_CONTINUABLE_IS_FIND_INCLUDED)
|
||||
- set(CTI_CONTINUABLE_IS_TOP_LEVEL_PROJECT OFF)
|
||||
-else()
|
||||
- string(COMPARE EQUAL ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_SOURCE_DIR}
|
||||
- CTI_CONTINUABLE_IS_TOP_LEVEL_PROJECT)
|
||||
-endif()
|
||||
-
|
||||
option(CTI_CONTINUABLE_WITH_INSTALL
|
||||
"Add the continuable install targets"
|
||||
${CTI_CONTINUABLE_IS_TOP_LEVEL_PROJECT})
|
||||
@@ -80,7 +73,7 @@ if(NOT TARGET Threads::Threads)
|
||||
Index: 4.2.0-0b164f3722.clean/CMakeLists.txt
|
||||
===================================================================
|
||||
--- 4.2.0-0b164f3722.clean.orig/CMakeLists.txt
|
||||
+++ 4.2.0-0b164f3722.clean/CMakeLists.txt
|
||||
@@ -82,7 +82,7 @@ if(NOT TARGET Threads::Threads)
|
||||
find_package(Threads REQUIRED)
|
||||
endif()
|
||||
|
||||
-if (CTI_CONTINUABLE_IS_TOP_LEVEL_PROJECT)
|
||||
+if (FALSE)
|
||||
-if(CTI_CONTINUABLE_IS_TOP_LEVEL_PROJECT)
|
||||
+if(false)
|
||||
include(cmake/CMakeLists.txt)
|
||||
add_subdirectory(dep)
|
||||
else()
|
||||
@@ -90,7 +83,7 @@ else()
|
||||
endif()
|
||||
|
||||
# continuable-base
|
||||
-if (CTI_CONTINUABLE_IS_TOP_LEVEL_PROJECT)
|
||||
+if (TRUE)
|
||||
add_library(continuable-base INTERFACE)
|
||||
else()
|
||||
add_library(continuable-base INTERFACE IMPORTED GLOBAL)
|
||||
@@ -146,7 +139,7 @@ if (CTI_CONTINUABLE_WITH_UNHANDLED_EXCEPTIONS)
|
||||
CONTINUABLE_WITH_UNHANDLED_EXCEPTIONS)
|
||||
endif()
|
||||
|
||||
-if (CTI_CONTINUABLE_IS_TOP_LEVEL_PROJECT)
|
||||
+if (TRUE)
|
||||
add_library(continuable INTERFACE)
|
||||
else()
|
||||
add_library(continuable INTERFACE IMPORTED GLOBAL)
|
||||
@@ -168,8 +161,8 @@ if (CTI_CONTINUABLE_WITH_INSTALL)
|
||||
# Headers and license files
|
||||
@@ -168,8 +168,8 @@ if(CTI_CONTINUABLE_WITH_INSTALL)
|
||||
# Create an install target: Headers and license files
|
||||
install(DIRECTORY "${PROJECT_SOURCE_DIR}/include/continuable"
|
||||
DESTINATION "include")
|
||||
- install(FILES "LICENSE.txt" DESTINATION .)
|
||||
|
@ -1,16 +1,15 @@
|
||||
vcpkg_from_github(
|
||||
OUT_SOURCE_PATH SOURCE_PATH
|
||||
REPO Naios/continuable
|
||||
REF 4.1.0
|
||||
SHA512 b80b1c13b068382553b727fd3b346323e2051b1c92237efa151ba8ec92b6d722ca993ae4bbf0e6e308a92834ae92011a179e74fcf713a09beaa48676f7d08340
|
||||
REF 4.2.0
|
||||
SHA512 c6b6aef0299d8dd548c3a283fdc436065da13446f965b45210dd998bbe1494776f2c005e7cb7eadc5e23a1f339e6c9124eda18e550bed646df5a0fd2aa92a24d
|
||||
HEAD_REF master
|
||||
PATCHES
|
||||
fix-cmakelists.patch
|
||||
)
|
||||
|
||||
vcpkg_configure_cmake(
|
||||
SOURCE_PATH ${SOURCE_PATH}
|
||||
PREFER_NINJA
|
||||
vcpkg_cmake_configure(
|
||||
SOURCE_PATH "${SOURCE_PATH}"
|
||||
OPTIONS
|
||||
-DCTI_CONTINUABLE_WITH_INSTALL=ON
|
||||
-DCTI_CONTINUABLE_WITH_TESTS=OFF
|
||||
@ -21,10 +20,10 @@ vcpkg_configure_cmake(
|
||||
-DCTI_CONTINUABLE_WITH_EXPERIMENTAL_COROUTINE=ON
|
||||
-DCTI_CONTINUABLE_WITH_CPP_LATEST=ON # requires cxx_std_17
|
||||
)
|
||||
vcpkg_install_cmake()
|
||||
vcpkg_cmake_install()
|
||||
vcpkg_copy_pdbs()
|
||||
vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/${PORT})
|
||||
vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/${PORT})
|
||||
|
||||
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib
|
||||
${CURRENT_PACKAGES_DIR}/debug
|
||||
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib"
|
||||
"${CURRENT_PACKAGES_DIR}/debug"
|
||||
)
|
||||
|
@ -1,9 +1,18 @@
|
||||
{
|
||||
"name": "continuable",
|
||||
"version-string": "4.1.0",
|
||||
"version": "4.2.0",
|
||||
"description": "C++14 asynchronous allocation aware futures (supporting then, exception handling, coroutines and connections)",
|
||||
"homepage": "https://naios.github.io/continuable/",
|
||||
"license": "MIT",
|
||||
"dependencies": [
|
||||
"function2"
|
||||
"function2",
|
||||
{
|
||||
"name": "vcpkg-cmake",
|
||||
"host": true
|
||||
},
|
||||
{
|
||||
"name": "vcpkg-cmake-config",
|
||||
"host": true
|
||||
}
|
||||
]
|
||||
}
|
||||
|
@ -1585,7 +1585,7 @@
|
||||
"port-version": 1
|
||||
},
|
||||
"continuable": {
|
||||
"baseline": "4.1.0",
|
||||
"baseline": "4.2.0",
|
||||
"port-version": 0
|
||||
},
|
||||
"convectionkernels": {
|
||||
|
@ -1,5 +1,10 @@
|
||||
{
|
||||
"versions": [
|
||||
{
|
||||
"git-tree": "9cb413050363e8549bbc5a5f50a7882441241416",
|
||||
"version": "4.2.0",
|
||||
"port-version": 0
|
||||
},
|
||||
{
|
||||
"git-tree": "d014250505dde9759c6e46aa6825115bfdd5a15c",
|
||||
"version-string": "4.1.0",
|
||||
|
Loading…
x
Reference in New Issue
Block a user