From aab8d8f30029604b0d82c1b55c8ef5b15b106f04 Mon Sep 17 00:00:00 2001 From: Ryan Date: Mon, 27 Sep 2021 21:07:48 -0700 Subject: [xbyak] Update port to 6.00 (#20377) * update to 6.00 * quote cmake arguments * update deprecated functions * update versioning --- ports/xbyak/portfile.cmake | 20 ++++++++------------ ports/xbyak/vcpkg.json | 14 ++++++++++++-- versions/baseline.json | 2 +- versions/x-/xbyak.json | 5 +++++ 4 files changed, 26 insertions(+), 15 deletions(-) diff --git a/ports/xbyak/portfile.cmake b/ports/xbyak/portfile.cmake index a2a06b1aa..2bfc9ff8f 100644 --- a/ports/xbyak/portfile.cmake +++ b/ports/xbyak/portfile.cmake @@ -3,23 +3,19 @@ vcpkg_fail_port_install(ON_ARCH "arm" ON_TARGET "uwp") vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO herumi/xbyak - REF 77ffe717376d194f1e5cc910bbd755d99bbba94e # 5.991 + cmake targets - SHA512 4e1ffa98dc63444aebf0a6e7a4ea57a9040cbf261f3a6fa43d23f0361cece71f1f4b597e95b6c85efbd4668e421081730b04ee924450ea0b0114923c36fc9c74 + REF v6.00 + SHA512 8bea95ddb44be39312083173cd4401039bd402c4732d97f9ff63174f6db29793f80dc1f1589d64bd96b4b13af819133897cd9843523662d13d57158c3837a778 HEAD_REF master ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA -) - -vcpkg_install_cmake() +vcpkg_cmake_configure(SOURCE_PATH "${SOURCE_PATH}") +vcpkg_cmake_install() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/${PORT}) +vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/${PORT}") file(REMOVE_RECURSE - ${CURRENT_PACKAGES_DIR}/debug - ${CURRENT_PACKAGES_DIR}/lib + "${CURRENT_PACKAGES_DIR}/debug" + "${CURRENT_PACKAGES_DIR}/lib" ) -file(INSTALL ${SOURCE_PATH}/COPYRIGHT DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/COPYRIGHT" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/xbyak/vcpkg.json b/ports/xbyak/vcpkg.json index 3f18d44c5..cf7a9efbd 100644 --- a/ports/xbyak/vcpkg.json +++ b/ports/xbyak/vcpkg.json @@ -1,7 +1,17 @@ { "name": "xbyak", - "version-string": "5.991", + "version-string": "6.00", "description": "Xbyak is a JIT assembler for x86(IA-32)/x64(AMD64, x86-64).", "homepage": "https://github.com/herumi/xbyak", - "supports": "!(arm | uwp)" + "supports": "!(arm | uwp)", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/versions/baseline.json b/versions/baseline.json index ceda112ec..20049abc2 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7033,7 +7033,7 @@ "port-version": 0 }, "xbyak": { - "baseline": "5.991", + "baseline": "6.00", "port-version": 0 }, "xerces-c": { diff --git a/versions/x-/xbyak.json b/versions/x-/xbyak.json index 8306213ce..480d7d214 100644 --- a/versions/x-/xbyak.json +++ b/versions/x-/xbyak.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ca393737aa37584343dc10008000c850f26b0881", + "version-string": "6.00", + "port-version": 0 + }, { "git-tree": "71447e4379e27bf5e16479edd03019e71ae36bb8", "version-string": "5.991", -- cgit v1.2.3