From 30cae466eafe3f040041a6dc9e321b0cf72b48ea Mon Sep 17 00:00:00 2001 From: myd7349 Date: Fri, 22 May 2020 02:35:54 +0800 Subject: [marl] Update to 2020-05-20 (#11465) * [marl] Update to 2020-05-20 * [marl] Update to 2020-05-21 --- ports/marl/CONTROL | 4 ++-- ports/marl/portfile.cmake | 16 ++++------------ 2 files changed, 6 insertions(+), 14 deletions(-) diff --git a/ports/marl/CONTROL b/ports/marl/CONTROL index 16f464135..7b9001db3 100644 --- a/ports/marl/CONTROL +++ b/ports/marl/CONTROL @@ -1,5 +1,5 @@ Source: marl -Version: 2019-09-13 +Version: 2020-05-21 Description: A hybrid thread/fiber task scheduler written in C++ 11 Homepage: https://github.com/google/marl -Supports: !uwp \ No newline at end of file +Supports: !uwp diff --git a/ports/marl/portfile.cmake b/ports/marl/portfile.cmake index 225aa93aa..e5749add4 100644 --- a/ports/marl/portfile.cmake +++ b/ports/marl/portfile.cmake @@ -1,16 +1,12 @@ -include(vcpkg_common_functions) - -if(VCPKG_TARGET_IS_UWP) - message(FATAL_ERROR "This port doesn't support UWP currently!") -endif() +vcpkg_fail_port_install(ON_TARGET "UWP") vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO google/marl - REF bf3e23083979c3bd3de1c77346b655eec423b3bc - SHA512 8c85b9a2b7e3cb397fc11c4bf32c5f62d4113ab6af92861c93472299f1b9296edef4dd8d1eb24db242fe55b52f33d2e058a4ce91fbaa793ffa4d5f4c8e336251 + REF 00433d41804f52af29ef6f386f4c479f48c63e66 + SHA512 8e86121cf212e4d7d2cfb1387a8f4c7749c82b8e916f4ea517d0a67696fefa91d900ffcf6f6358586cc341e8620ccb03ce2505b7828fd56a9d7561b9a2523bfd HEAD_REF master ) @@ -27,8 +23,4 @@ vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/${PORT}) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -# Handle copyright -configure_file(${SOURCE_PATH}/LICENSE ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY) - -# CMake integration test -vcpkg_test_cmake(PACKAGE_NAME ${PORT}) +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) -- cgit v1.2.3