From dc5789300b7d7a989fe58f68e21d10bbc2f4a737 Mon Sep 17 00:00:00 2001 From: neargye Date: Tue, 10 May 2022 23:54:50 +0400 Subject: [PATCH 01/15] [magic-enum] Update to v0.8.0 --- ports/magic-enum/portfile.cmake | 5 +++-- ports/magic-enum/vcpkg.json | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/ports/magic-enum/portfile.cmake b/ports/magic-enum/portfile.cmake index b612ccabe84e4d..7978079d6348e3 100644 --- a/ports/magic-enum/portfile.cmake +++ b/ports/magic-enum/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Neargye/magic_enum - REF v0.7.3 - SHA512 7645ef56bbe262ba801c6f5ffb7baf997869de6422a239ef2000d7ff6f4f6d00c34360543c60aa91a02433311b4b996bba410e4f04f96f185a6276ad9e6bb0a8 + REF v0.8.0 + SHA512 097260c234a1b716d26b537cd80a8d3eca255422e8dce46183708a27b1d4ad1d81c6be05f1b7d300db3362eafa243cccc39c9d12f1bcbfdb0d7755701a222808 HEAD_REF master ) @@ -12,6 +12,7 @@ vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA OPTIONS + -DMAGIC_ENUM_OPT_ENABLE_NONASCII=OFF -DMAGIC_ENUM_OPT_BUILD_EXAMPLES=OFF -DMAGIC_ENUM_OPT_BUILD_TESTS=OFF -DMAGIC_ENUM_OPT_INSTALL=ON diff --git a/ports/magic-enum/vcpkg.json b/ports/magic-enum/vcpkg.json index 44979659563122..e841f360fe7d01 100644 --- a/ports/magic-enum/vcpkg.json +++ b/ports/magic-enum/vcpkg.json @@ -1,6 +1,6 @@ { "name": "magic-enum", - "version-string": "0.7.3", + "version-string": "0.8.0", "port-version": 1, "description": "Header-only C++17 library provides static reflection for enums, work with any enum type without any macro or boilerplate code.", "homepage": "https://github.com/Neargye/magic_enum" From 63cfbb9acbe03c719535018f2c23b06139c1b457 Mon Sep 17 00:00:00 2001 From: neargye Date: Tue, 10 May 2022 23:58:00 +0400 Subject: [PATCH 02/15] x-add-version --- versions/baseline.json | 2 +- versions/m-/magic-enum.json | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/versions/baseline.json b/versions/baseline.json index a106b41d4f524c..2309e16043f413 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4345,7 +4345,7 @@ "port-version": 0 }, "magic-enum": { - "baseline": "0.7.3", + "baseline": "0.8.0", "port-version": 1 }, "magic-get": { diff --git a/versions/m-/magic-enum.json b/versions/m-/magic-enum.json index 26748e3dd32d83..e21392f625de52 100644 --- a/versions/m-/magic-enum.json +++ b/versions/m-/magic-enum.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4eb8c4e7bf5e09137569cec58b0cacb2a5bfaefa", + "version-string": "0.8.0", + "port-version": 1 + }, { "git-tree": "1962d2e544199e80b56432fb1bd1e28c12cca3ad", "version-string": "0.7.3", From 30d10bf121e25eb9f131fee96d0fd7fe615c4b11 Mon Sep 17 00:00:00 2001 From: neargye Date: Wed, 11 May 2022 00:15:44 +0400 Subject: [PATCH 03/15] fix deprecated --- ports/magic-enum/portfile.cmake | 6 +++--- ports/magic-enum/vcpkg.json | 5 +++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/ports/magic-enum/portfile.cmake b/ports/magic-enum/portfile.cmake index 7978079d6348e3..905a5d2a1ebe43 100644 --- a/ports/magic-enum/portfile.cmake +++ b/ports/magic-enum/portfile.cmake @@ -8,7 +8,7 @@ vcpkg_from_github( HEAD_REF master ) -vcpkg_configure_cmake( +vcpkg_cmake_configure( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA OPTIONS @@ -18,9 +18,9 @@ vcpkg_configure_cmake( -DMAGIC_ENUM_OPT_INSTALL=ON ) -vcpkg_install_cmake() +vcpkg_cmake_install() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/magic_enum TARGET_PATH share/magic_enum) +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/magic_enum TARGET_PATH share/magic_enum) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug ${CURRENT_PACKAGES_DIR}/lib) diff --git a/ports/magic-enum/vcpkg.json b/ports/magic-enum/vcpkg.json index e841f360fe7d01..abf4cc44b2600e 100644 --- a/ports/magic-enum/vcpkg.json +++ b/ports/magic-enum/vcpkg.json @@ -1,7 +1,8 @@ { "name": "magic-enum", - "version-string": "0.8.0", + "version": "0.8.0", "port-version": 1, "description": "Header-only C++17 library provides static reflection for enums, work with any enum type without any macro or boilerplate code.", - "homepage": "https://github.com/Neargye/magic_enum" + "homepage": "https://github.com/Neargye/magic_enum", + "license": "MIT" } From 5ca8fb5980a508ded1ab0eb8f6a385caf28a0014 Mon Sep 17 00:00:00 2001 From: neargye Date: Wed, 11 May 2022 00:26:33 +0400 Subject: [PATCH 04/15] fix review --- ports/magic-enum/portfile.cmake | 1 - ports/magic-enum/vcpkg.json | 1 - versions/m-/magic-enum.json | 2 +- 3 files changed, 1 insertion(+), 3 deletions(-) diff --git a/ports/magic-enum/portfile.cmake b/ports/magic-enum/portfile.cmake index 905a5d2a1ebe43..2901c90fef051d 100644 --- a/ports/magic-enum/portfile.cmake +++ b/ports/magic-enum/portfile.cmake @@ -10,7 +10,6 @@ vcpkg_from_github( vcpkg_cmake_configure( SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA OPTIONS -DMAGIC_ENUM_OPT_ENABLE_NONASCII=OFF -DMAGIC_ENUM_OPT_BUILD_EXAMPLES=OFF diff --git a/ports/magic-enum/vcpkg.json b/ports/magic-enum/vcpkg.json index abf4cc44b2600e..58b349258a3796 100644 --- a/ports/magic-enum/vcpkg.json +++ b/ports/magic-enum/vcpkg.json @@ -1,7 +1,6 @@ { "name": "magic-enum", "version": "0.8.0", - "port-version": 1, "description": "Header-only C++17 library provides static reflection for enums, work with any enum type without any macro or boilerplate code.", "homepage": "https://github.com/Neargye/magic_enum", "license": "MIT" diff --git a/versions/m-/magic-enum.json b/versions/m-/magic-enum.json index e21392f625de52..50ee01d15b8967 100644 --- a/versions/m-/magic-enum.json +++ b/versions/m-/magic-enum.json @@ -3,7 +3,7 @@ { "git-tree": "4eb8c4e7bf5e09137569cec58b0cacb2a5bfaefa", "version-string": "0.8.0", - "port-version": 1 + "port-version": 0 }, { "git-tree": "1962d2e544199e80b56432fb1bd1e28c12cca3ad", From 8e277f9947bc6301c295ec9d93774f95295cdac2 Mon Sep 17 00:00:00 2001 From: neargye Date: Wed, 11 May 2022 00:28:38 +0400 Subject: [PATCH 05/15] fix version --- versions/baseline.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/baseline.json b/versions/baseline.json index 2309e16043f413..dd017008fae317 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4346,7 +4346,7 @@ }, "magic-enum": { "baseline": "0.8.0", - "port-version": 1 + "port-version": 0 }, "magic-get": { "baseline": "2019-09-02", From 64e58ec911c5741ca2dc9316437588fc261788cf Mon Sep 17 00:00:00 2001 From: Daniil Goncharov Date: Wed, 11 May 2022 00:29:49 +0400 Subject: [PATCH 06/15] Update ports/magic-enum/portfile.cmake Co-authored-by: Thomas1664 <46387399+Thomas1664@users.noreply.github.com> --- ports/magic-enum/portfile.cmake | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ports/magic-enum/portfile.cmake b/ports/magic-enum/portfile.cmake index 2901c90fef051d..7d21d6269ba329 100644 --- a/ports/magic-enum/portfile.cmake +++ b/ports/magic-enum/portfile.cmake @@ -9,7 +9,8 @@ vcpkg_from_github( ) vcpkg_cmake_configure( - SOURCE_PATH ${SOURCE_PATH} + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS -DMAGIC_ENUM_OPT_ENABLE_NONASCII=OFF -DMAGIC_ENUM_OPT_BUILD_EXAMPLES=OFF From 15f3c4c722db989574b1a45dce723ba954fc8564 Mon Sep 17 00:00:00 2001 From: Daniil Goncharov Date: Wed, 11 May 2022 00:32:13 +0400 Subject: [PATCH 07/15] Update ports/magic-enum/portfile.cmake Co-authored-by: Thomas1664 <46387399+Thomas1664@users.noreply.github.com> --- ports/magic-enum/portfile.cmake | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ports/magic-enum/portfile.cmake b/ports/magic-enum/portfile.cmake index 7d21d6269ba329..537f6740df9cb8 100644 --- a/ports/magic-enum/portfile.cmake +++ b/ports/magic-enum/portfile.cmake @@ -22,7 +22,8 @@ vcpkg_cmake_install() vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/magic_enum TARGET_PATH share/magic_enum) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug ${CURRENT_PACKAGES_DIR}/lib) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug" "${CURRENT_PACKAGES_DIR}/lib") + # Handle copyright configure_file(${SOURCE_PATH}/LICENSE ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY) From dd4272c9d5f8af42094ca5f7c01b476019ba52cf Mon Sep 17 00:00:00 2001 From: Daniil Goncharov Date: Wed, 11 May 2022 01:01:59 +0400 Subject: [PATCH 08/15] Update versions/m-/magic-enum.json Co-authored-by: Thomas1664 <46387399+Thomas1664@users.noreply.github.com> --- versions/m-/magic-enum.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/m-/magic-enum.json b/versions/m-/magic-enum.json index 50ee01d15b8967..9603b9bb6385a2 100644 --- a/versions/m-/magic-enum.json +++ b/versions/m-/magic-enum.json @@ -2,7 +2,7 @@ "versions": [ { "git-tree": "4eb8c4e7bf5e09137569cec58b0cacb2a5bfaefa", - "version-string": "0.8.0", + "version": "0.8.0", "port-version": 0 }, { From 01f9a2ab4af339c71a7e598d58ac9ec44e6469d4 Mon Sep 17 00:00:00 2001 From: neargye Date: Wed, 11 May 2022 01:11:11 +0400 Subject: [PATCH 09/15] fix review --- ports/magic-enum/portfile.cmake | 3 +-- ports/magic-enum/vcpkg.json | 12 +++++++++++- versions/m-/magic-enum.json | 2 +- 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/ports/magic-enum/portfile.cmake b/ports/magic-enum/portfile.cmake index 537f6740df9cb8..7a5fa1bc283ce7 100644 --- a/ports/magic-enum/portfile.cmake +++ b/ports/magic-enum/portfile.cmake @@ -24,6 +24,5 @@ vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/magic_enum TARGET_PATH share/magi file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug" "${CURRENT_PACKAGES_DIR}/lib") - # Handle copyright -configure_file(${SOURCE_PATH}/LICENSE ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY) +configure_file("${SOURCE_PATH}/LICENSE" "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" COPYONLY) diff --git a/ports/magic-enum/vcpkg.json b/ports/magic-enum/vcpkg.json index 58b349258a3796..642141ff753b0c 100644 --- a/ports/magic-enum/vcpkg.json +++ b/ports/magic-enum/vcpkg.json @@ -3,5 +3,15 @@ "version": "0.8.0", "description": "Header-only C++17 library provides static reflection for enums, work with any enum type without any macro or boilerplate code.", "homepage": "https://github.com/Neargye/magic_enum", - "license": "MIT" + "license": "MIT", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/versions/m-/magic-enum.json b/versions/m-/magic-enum.json index 9603b9bb6385a2..9c23796d46562f 100644 --- a/versions/m-/magic-enum.json +++ b/versions/m-/magic-enum.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "4eb8c4e7bf5e09137569cec58b0cacb2a5bfaefa", + "git-tree": "d591d0f3c913481cffd7a94eb4bc193877164679", "version": "0.8.0", "port-version": 0 }, From 9574f2a266bf8be58a924b8bedb749c62c2e0501 Mon Sep 17 00:00:00 2001 From: neargye Date: Wed, 11 May 2022 01:14:18 +0400 Subject: [PATCH 10/15] overwrite-version --- versions/m-/magic-enum.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/m-/magic-enum.json b/versions/m-/magic-enum.json index 9c23796d46562f..5340e25b7c7955 100644 --- a/versions/m-/magic-enum.json +++ b/versions/m-/magic-enum.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "d591d0f3c913481cffd7a94eb4bc193877164679", + "git-tree": "54d921619501885c2e0fc9b2b0749397496603af", "version": "0.8.0", "port-version": 0 }, From 112fb96196346c25895834a922046f388114c949 Mon Sep 17 00:00:00 2001 From: neargye Date: Wed, 11 May 2022 01:49:17 +0400 Subject: [PATCH 11/15] fix cmake --- ports/magic-enum/portfile.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/magic-enum/portfile.cmake b/ports/magic-enum/portfile.cmake index 7a5fa1bc283ce7..31600271a39aed 100644 --- a/ports/magic-enum/portfile.cmake +++ b/ports/magic-enum/portfile.cmake @@ -20,7 +20,7 @@ vcpkg_cmake_configure( vcpkg_cmake_install() -vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/magic_enum TARGET_PATH share/magic_enum) +vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/magic_enum" TARGET_PATH "share/magic_enum") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug" "${CURRENT_PACKAGES_DIR}/lib") From f8ac053c71a9cf2c929409129486fd1753378438 Mon Sep 17 00:00:00 2001 From: neargye Date: Wed, 11 May 2022 01:54:55 +0400 Subject: [PATCH 12/15] fix onfig_fixup --- ports/magic-enum/portfile.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/magic-enum/portfile.cmake b/ports/magic-enum/portfile.cmake index 31600271a39aed..02faf4c2b92714 100644 --- a/ports/magic-enum/portfile.cmake +++ b/ports/magic-enum/portfile.cmake @@ -20,7 +20,7 @@ vcpkg_cmake_configure( vcpkg_cmake_install() -vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/magic_enum" TARGET_PATH "share/magic_enum") +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/magic_enum PACKAGE_NAME magic_enum) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug" "${CURRENT_PACKAGES_DIR}/lib") From 7daa6bf278bc2e8a329e88602e961b23f13fad7e Mon Sep 17 00:00:00 2001 From: neargye Date: Wed, 11 May 2022 01:55:08 +0400 Subject: [PATCH 13/15] overwrite-version --- versions/m-/magic-enum.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/m-/magic-enum.json b/versions/m-/magic-enum.json index 5340e25b7c7955..e9b43aa3232784 100644 --- a/versions/m-/magic-enum.json +++ b/versions/m-/magic-enum.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "54d921619501885c2e0fc9b2b0749397496603af", + "git-tree": "cb84827b80d958ad762b4a427b3da1a0a76e03cb", "version": "0.8.0", "port-version": 0 }, From acf1ecd5cafa98fbb645aac4f05873f8460c42e4 Mon Sep 17 00:00:00 2001 From: neargye Date: Wed, 11 May 2022 12:52:13 +0400 Subject: [PATCH 14/15] delete extra blank line --- ports/magic-enum/portfile.cmake | 1 - 1 file changed, 1 deletion(-) diff --git a/ports/magic-enum/portfile.cmake b/ports/magic-enum/portfile.cmake index 02faf4c2b92714..27108907457123 100644 --- a/ports/magic-enum/portfile.cmake +++ b/ports/magic-enum/portfile.cmake @@ -10,7 +10,6 @@ vcpkg_from_github( vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" - OPTIONS -DMAGIC_ENUM_OPT_ENABLE_NONASCII=OFF -DMAGIC_ENUM_OPT_BUILD_EXAMPLES=OFF From b10a6ba447c4db8b27f916e50e29c55881eb6072 Mon Sep 17 00:00:00 2001 From: neargye Date: Wed, 11 May 2022 12:52:41 +0400 Subject: [PATCH 15/15] overwrite-version --- versions/m-/magic-enum.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/m-/magic-enum.json b/versions/m-/magic-enum.json index e9b43aa3232784..445bc5af81e967 100644 --- a/versions/m-/magic-enum.json +++ b/versions/m-/magic-enum.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "cb84827b80d958ad762b4a427b3da1a0a76e03cb", + "git-tree": "2b170feb45c6c04a727f51a40d65fd01b5f0afdc", "version": "0.8.0", "port-version": 0 },