Skip to content

Commit 7fbb196

Browse files
[coroutine] update to 1.5.0 (#10692)
* [coroutine] update to 1.5.0 * this is release candidate * WindowsStore build will be updated soon * [coroutine] support UWP build * triplet(community) `x64-uwp`, `x86-uwp` * triplet: `arm-uwp`, `arm64-windows` * [coroutine] mark install failure on uwp/linux * update checksum * use `vcpkg_fail_port_install` * [coroutine] remove x86-windows fail in ci.baseline * [coroutine] Relax install restrictions on Linux. Use vcpkg_fixup_cmake_targets(). Co-authored-by: Robert Schumacher <[email protected]>
1 parent 84f94fb commit 7fbb196

File tree

3 files changed

+16
-23
lines changed

3 files changed

+16
-23
lines changed

ports/coroutine/CONTROL

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
Source: coroutine
2-
Version: 2020-01-13
2+
Homepage: https://github.com/luncliff/coroutine
3+
Version: 1.5.0
34
Build-Depends: ms-gsl
4-
Description: C++ coroutine helper/example library
5-
Supports: !x86
5+
Description: C++ 20 Coroutines helper/example library
6+
Supports: !uwp

ports/coroutine/portfile.cmake

Lines changed: 12 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,31 @@
1-
include(vcpkg_common_functions)
1+
vcpkg_fail_port_install(ON_TARGET "UWP")
22

3-
if(${VCPKG_TARGET_ARCHITECTURE} MATCHES x86)
4-
message(FATAL_ERROR "This library doesn't support x86 arch. Please use x64 instead. If it is critical, create an issue at the repo: github.com/luncliff/coroutine")
3+
if(VCPKG_TARGET_IS_LINUX)
4+
message("Warning: `coroutine` requires libc++ and Clang or GCC 10+ on Linux")
55
endif()
66

77
vcpkg_from_github(
88
OUT_SOURCE_PATH SOURCE_PATH
99
REPO luncliff/coroutine
10-
REF fcd970807e9a47c250c1a4e06c7dc6d93079b684
11-
SHA512 517f1c1726e4adc36cd34379c545324c99861d7cb5ebd3cebe0b7132fe5b61969a00e405bc106bb8f089f37d3a7ca9b1bcdc665a5cd6dfcaaf6856be37bec5b0
10+
REF 1.5.0
11+
SHA512 61b91fdc641b6905b884e99c5bf193ec2cf6962144ab3baafdb9432115757d96f3797f116b30356f0d21417b23082bc908f75042721caeab3329c4910b654594
1212
HEAD_REF master
1313
)
1414

15-
# package: 'ms-gsl'
16-
set(GSL_INCLUDE_DIR ${CURRENT_INSTALLED_DIR}/include
17-
CACHE PATH "path to include C++ core guideline support library" FORCE)
18-
message(STATUS "Using ms-gsl at ${GSL_INCLUDE_DIR}")
19-
2015
vcpkg_configure_cmake(
2116
SOURCE_PATH ${SOURCE_PATH}
2217
PREFER_NINJA
2318
OPTIONS
24-
-DGSL_INCLUDE_DIR=${GSL_INCLUDE_DIR}
25-
-DTEST_DISABLED=True
19+
-DGSL_INCLUDE_DIR=${CURRENT_INSTALLED_DIR}/include
20+
-DBUILD_TESTING=False
2621
)
27-
2822
vcpkg_install_cmake()
23+
vcpkg_fixup_cmake_targets()
2924

30-
file(
31-
INSTALL ${SOURCE_PATH}/LICENSE
32-
DESTINATION ${CURRENT_PACKAGES_DIR}/share/coroutine
33-
RENAME copyright
25+
file(INSTALL ${SOURCE_PATH}/LICENSE
26+
DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}
27+
RENAME copyright
3428
)
29+
vcpkg_copy_pdbs()
3530

36-
# removed duplicates in debug
3731
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
38-
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)

scripts/ci.baseline.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -264,7 +264,6 @@ coolprop:x64-uwp=fail
264264
coroutine:arm-uwp=fail
265265
coroutine:x64-linux=fail
266266
coroutine:x64-uwp=fail
267-
coroutine:x86-windows=fail
268267
corrade:arm64-windows=fail
269268
corrade:arm-uwp=fail
270269
corrade:x64-uwp=fail

0 commit comments

Comments
 (0)