Skip to content

[marl] Update to 2020-06-30 #12162

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 4 commits into from
Jul 6, 2020
Merged

[marl] Update to 2020-06-30 #12162

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f54299b
[marl] Update to 2020-06-30
myd7349 Jun 30, 2020
83cd383
[marl] Fix typo
myd7349 Jun 30, 2020
8056865
Merge branch 'master' into marl-main
myd7349 Jul 1, 2020
bb0757f
[marl] Add manifest
myd7349 Jul 1, 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
5 changes: 0 additions & 5 deletions ports/marl/CONTROL
View file
Open in desktop

This file was deleted.

21 changes: 16 additions & 5 deletions ports/marl/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,26 +1,37 @@
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 00433d41804f52af29ef6f386f4c479f48c63e66
SHA512 8e86121cf212e4d7d2cfb1387a8f4c7749c82b8e916f4ea517d0a67696fefa91d900ffcf6f6358586cc341e8620ccb03ce2505b7828fd56a9d7561b9a2523bfd
HEAD_REF master
REF 45be9b248306e6ec3136efdd256d769c23b581d1
SHA512 24efe143718adbf4894e21e715ef5ed2585085b7b3729d9e21d3b0951c7c939e16c9f531eb52ec489cb539d1f70a2dcde025b7bbcbb2165ddf1a5b8278f9b806
HEAD_REF main
)

string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" MARL_BUILD_SHARED)

vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
PREFER_NINJA
OPTIONS
-DMARL_BUILD_SHARED=${MARL_BUILD_SHARED}
-DMARL_INSTALL=ON
)

vcpkg_install_cmake()

if(MARL_BUILD_SHARED)
vcpkg_replace_string(
"${CURRENT_PACKAGES_DIR}/include/marl/export.h"
"#ifdef MARL_DLL"
"#if 1 // #ifdef MARL_DLL"
)
endif()

vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/${PORT})

vcpkg_copy_pdbs()

file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)

file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
8 changes: 8 additions & 0 deletions ports/marl/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"name": "marl",
"version-string": "2020-06-30",
"description": "A hybrid thread/fiber task scheduler written in modern C++",
"homepage": "https://github.com/google/marl",
"license": "Apache-2.0",
"supports": "!uwp"
}