Skip to content

[coroutine] update to 1.5.0 #10692

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ras0219-msft merged 6 commits into from
Apr 24, 2020
Merged

[coroutine] update to 1.5.0 #10692

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
1a807ce
[coroutine] update to 1.5.0
luncliff Apr 4, 2020
25a3c49
[coroutine] support UWP build
luncliff Apr 4, 2020
ca3e270
[coroutine] mark install failure on uwp/linux
luncliff Apr 16, 2020
bfaa3a5
Merge branch 'master' of https://github.com/microsoft/vcpkg
luncliff Apr 16, 2020
e20322f
[coroutine] remove x86-windows fail in ci.baseline
luncliff Apr 17, 2020
4b41850
[coroutine] Relax install restrictions on Linux. Use vcpkg_fixup_cmak…
ras0219-msft Apr 24, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions ports/coroutine/CONTROL
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
Source: coroutine
Version: 2020-01-13
Homepage: https://github.com/luncliff/coroutine
Version: 1.5.0
Build-Depends: ms-gsl
Description: C++ coroutine helper/example library
Supports: !x86
Description: C++ 20 Coroutines helper/example library
Supports: !uwp
31 changes: 12 additions & 19 deletions ports/coroutine/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,38 +1,31 @@
include(vcpkg_common_functions)
vcpkg_fail_port_install(ON_TARGET "UWP")

if(${VCPKG_TARGET_ARCHITECTURE} MATCHES x86)
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")
if(VCPKG_TARGET_IS_LINUX)
message("Warning: `coroutine` requires libc++ and Clang or GCC 10+ on Linux")
endif()

vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO luncliff/coroutine
REF fcd970807e9a47c250c1a4e06c7dc6d93079b684
SHA512 517f1c1726e4adc36cd34379c545324c99861d7cb5ebd3cebe0b7132fe5b61969a00e405bc106bb8f089f37d3a7ca9b1bcdc665a5cd6dfcaaf6856be37bec5b0
REF 1.5.0
SHA512 61b91fdc641b6905b884e99c5bf193ec2cf6962144ab3baafdb9432115757d96f3797f116b30356f0d21417b23082bc908f75042721caeab3329c4910b654594
HEAD_REF master
)

# package: 'ms-gsl'
set(GSL_INCLUDE_DIR ${CURRENT_INSTALLED_DIR}/include
CACHE PATH "path to include C++ core guideline support library" FORCE)
message(STATUS "Using ms-gsl at ${GSL_INCLUDE_DIR}")

vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
PREFER_NINJA
OPTIONS
-DGSL_INCLUDE_DIR=${GSL_INCLUDE_DIR}
-DTEST_DISABLED=True
-DGSL_INCLUDE_DIR=${CURRENT_INSTALLED_DIR}/include
-DBUILD_TESTING=False
)

vcpkg_install_cmake()
vcpkg_fixup_cmake_targets()

file(
INSTALL ${SOURCE_PATH}/LICENSE
DESTINATION ${CURRENT_PACKAGES_DIR}/share/coroutine
RENAME copyright
file(INSTALL ${SOURCE_PATH}/LICENSE
DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}
RENAME copyright
)
vcpkg_copy_pdbs()

# removed duplicates in debug
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
1 change: 0 additions & 1 deletion scripts/ci.baseline.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -262,7 +262,6 @@ coolprop:x64-uwp=fail
coroutine:arm-uwp=fail
coroutine:x64-linux=fail
coroutine:x64-uwp=fail
coroutine:x86-windows=fail
corrade:arm64-windows=fail
corrade:arm-uwp=fail
corrade:x64-uwp=fail
Expand Down