update co to v2.0.2 (#20500)

* update co to v2.0.2

* fix gitree in co.json

* add install-dll.patch for co

* update version

* fix CRT linkage

* update version

* minimal patch

* update version
This commit is contained in:
Alvin 2021-10-06 09:42:39 +08:00 committed by GitHub
parent c8fe3a53f7
commit 8678672d59
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 27 additions and 8 deletions

View File

@ -0,0 +1,10 @@
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 9e03c9a..499b550 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -112,4 +112,5 @@ install(
TARGETS co
LIBRARY DESTINATION lib # shared lib installed to ${CMAKE_INSTALL_PREFIX}/lib
ARCHIVE DESTINATION lib # static lib installed to ${CMAKE_INSTALL_PREFIX}/lib
+ RUNTIME DESTINATION bin
)

View File

@ -2,17 +2,18 @@ if(VCPKG_TARGET_IS_WINDOWS OR VCPKG_TARGET_IS_UWP)
vcpkg_fail_port_install(ON_ARCH "arm" ON_TAREGT "uwp") vcpkg_fail_port_install(ON_ARCH "arm" ON_TAREGT "uwp")
endif() endif()
# It's not safe to use dynamic library, as we hooked some system APIs in CO.
vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
vcpkg_from_github( vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH OUT_SOURCE_PATH SOURCE_PATH
REPO idealvin/co REPO idealvin/co
REF 82b9f75dcd114c69d2b9c2c5a13ce2c3b95ba99f #v2.0.1 REF 25915760f5cbcde1c5af625dd4d19a632ae43f12 #v2.0.2
SHA512 ec33c5b920adf8b5e5500ed7c9768bd595ba2b568b604f26f953ddb5d04e411e8a2ea05b213595a44cafbadf90c1e1661208855301b2b47295ccc6e20f36e8d8 SHA512 892d70923409306ab548cf4568f15ffd13949047a5a7810c68d60c1afd184eafd2076f62eb6249ae64b38c409255cb873fa28740ceab37b908b70174ddf6d077
HEAD_REF master HEAD_REF master
PATCHES
install-dll.patch
) )
string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "static" STATIC_CRT)
vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
FEATURES FEATURES
libcurl WITH_LIBCURL libcurl WITH_LIBCURL
@ -21,7 +22,10 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
vcpkg_cmake_configure( vcpkg_cmake_configure(
SOURCE_PATH "${SOURCE_PATH}" SOURCE_PATH "${SOURCE_PATH}"
OPTIONS ${FEATURE_OPTIONS} OPTIONS
${FEATURE_OPTIONS}
-DSTATIC_VS_CRT=${STATIC_CRT}
DISABLE_PARALLEL_CONFIGURE
) )
vcpkg_cmake_install() vcpkg_cmake_install()

View File

@ -1,6 +1,6 @@
{ {
"name": "co", "name": "co",
"version-semver": "2.0.1", "version-semver": "2.0.2",
"description": "A go-style coroutine library in C++11 and more", "description": "A go-style coroutine library in C++11 and more",
"homepage": "https://github.com/idealvin/co", "homepage": "https://github.com/idealvin/co",
"supports": "!uwp & !(arm & windows)", "supports": "!uwp & !(arm & windows)",

View File

@ -1417,7 +1417,7 @@
"port-version": 1 "port-version": 1
}, },
"co": { "co": {
"baseline": "2.0.1", "baseline": "2.0.2",
"port-version": 0 "port-version": 0
}, },
"coin": { "coin": {

View File

@ -1,5 +1,10 @@
{ {
"versions": [ "versions": [
{
"git-tree": "2b21d0aa5397dedda9219671af687afacab91a6c",
"version-semver": "2.0.2",
"port-version": 0
},
{ {
"git-tree": "c9f30ca17733d2c0f4b071ca90d6500c456ac7d0", "git-tree": "c9f30ca17733d2c0f4b071ca90d6500c456ac7d0",
"version-semver": "2.0.1", "version-semver": "2.0.1",