diff options
| author | Park DongHa <luncliff@gmail.com> | 2020-04-25 06:02:39 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-24 14:02:39 -0700 |
| commit | 7fbb19602a82dc25c370d1d87014fbe748002a4e (patch) | |
| tree | 12bf3afa214adb67dc1928528d30acd1bcb91a5d | |
| parent | 84f94fb6fd9dc993f608d65c383592d6d8b6a798 (diff) | |
| download | vcpkg-7fbb19602a82dc25c370d1d87014fbe748002a4e.tar.gz vcpkg-7fbb19602a82dc25c370d1d87014fbe748002a4e.zip | |
[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 <roschuma@microsoft.com>
| -rw-r--r-- | ports/coroutine/CONTROL | 7 | ||||
| -rw-r--r-- | ports/coroutine/portfile.cmake | 31 | ||||
| -rw-r--r-- | scripts/ci.baseline.txt | 1 |
3 files changed, 16 insertions, 23 deletions
diff --git a/ports/coroutine/CONTROL b/ports/coroutine/CONTROL index c716f2585..13fa58ab2 100644 --- a/ports/coroutine/CONTROL +++ b/ports/coroutine/CONTROL @@ -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
\ No newline at end of file +Description: C++ 20 Coroutines helper/example library +Supports: !uwp diff --git a/ports/coroutine/portfile.cmake b/ports/coroutine/portfile.cmake index a38911f3c..26abb7bf7 100644 --- a/ports/coroutine/portfile.cmake +++ b/ports/coroutine/portfile.cmake @@ -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) diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 961116554..efaddf1ce 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -264,7 +264,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
|