diff options
| author | myd7349 <myd7349@gmail.com> | 2020-07-07 04:35:42 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-06 13:35:42 -0700 |
| commit | 89746990b73618255b0c2e602c8e0a8d233831c9 (patch) | |
| tree | 9549e5c8f461751fb19eebfa19bb4ce2715fffb3 | |
| parent | d1a86d47d87931cd3877f1e94d334e0e9835d657 (diff) | |
| download | vcpkg-89746990b73618255b0c2e602c8e0a8d233831c9.tar.gz vcpkg-89746990b73618255b0c2e602c8e0a8d233831c9.zip | |
[marl] Update to 2020-06-30 (#12162)
* [marl] Update to 2020-06-30
[marl] Repoint HEAD_REF to `main` (#11953)
[marl] Dynamic build support
* [marl] Fix typo
* [marl] Add manifest
| -rw-r--r-- | ports/marl/CONTROL | 5 | ||||
| -rw-r--r-- | ports/marl/portfile.cmake | 21 | ||||
| -rw-r--r-- | ports/marl/vcpkg.json | 8 |
3 files changed, 24 insertions, 10 deletions
diff --git a/ports/marl/CONTROL b/ports/marl/CONTROL deleted file mode 100644 index 7b9001db3..000000000 --- a/ports/marl/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: marl
-Version: 2020-05-21
-Description: A hybrid thread/fiber task scheduler written in C++ 11
-Homepage: https://github.com/google/marl
-Supports: !uwp
diff --git a/ports/marl/portfile.cmake b/ports/marl/portfile.cmake index e5749add4..40d5102ee 100644 --- a/ports/marl/portfile.cmake +++ b/ports/marl/portfile.cmake @@ -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)
diff --git a/ports/marl/vcpkg.json b/ports/marl/vcpkg.json new file mode 100644 index 000000000..7bf0f8ef6 --- /dev/null +++ b/ports/marl/vcpkg.json @@ -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" +} |