From 3aebd5b88b4fd26cfd7fa5d8541b41d24c35973b Mon Sep 17 00:00:00 2001 From: Yury Bura Date: Tue, 7 Jan 2025 01:41:07 +0100 Subject: [PATCH] [magic-enum] Fix installation directory of CMake configurations (#43032) --- ports/magic-enum/portfile.cmake | 8 ++------ ports/magic-enum/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/m-/magic-enum.json | 5 +++++ 4 files changed, 9 insertions(+), 7 deletions(-) diff --git a/ports/magic-enum/portfile.cmake b/ports/magic-enum/portfile.cmake index bcf5f33050..74034e2c5c 100644 --- a/ports/magic-enum/portfile.cmake +++ b/ports/magic-enum/portfile.cmake @@ -17,12 +17,8 @@ vcpkg_cmake_configure( ) vcpkg_cmake_install() -vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/magic_enum PACKAGE_NAME magic_enum) +vcpkg_cmake_config_fixup(CONFIG_PATH share/cmake/magic_enum PACKAGE_NAME magic_enum) vcpkg_fixup_pkgconfig() - -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib") - -# Handle copyright -configure_file("${SOURCE_PATH}/LICENSE" "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" COPYONLY) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") diff --git a/ports/magic-enum/vcpkg.json b/ports/magic-enum/vcpkg.json index 0986cbdd9d..93cac6f285 100644 --- a/ports/magic-enum/vcpkg.json +++ b/ports/magic-enum/vcpkg.json @@ -1,6 +1,7 @@ { "name": "magic-enum", "version": "0.9.7", + "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/baseline.json b/versions/baseline.json index 9d17205ccd..7a7d194841 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5738,7 +5738,7 @@ }, "magic-enum": { "baseline": "0.9.7", - "port-version": 0 + "port-version": 1 }, "magic-get": { "baseline": "2019-09-02", diff --git a/versions/m-/magic-enum.json b/versions/m-/magic-enum.json index 8a4dfc303d..4ea36c783b 100644 --- a/versions/m-/magic-enum.json +++ b/versions/m-/magic-enum.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9ab95f56c0327e8b6c0190fae3d975439161ffaa", + "version": "0.9.7", + "port-version": 1 + }, { "git-tree": "dd998971fdcd05406e77a56d26e798393c918740", "version": "0.9.7",