From 095121409e7dfe2aae8e3ea21cb5eb582a64b041 Mon Sep 17 00:00:00 2001 From: Frank <65999885+FrankXie05@users.noreply.github.com> Date: Sat, 4 Feb 2023 04:34:23 +0800 Subject: [PATCH] [platform-folders] update version to 4.2.0 (#29409) * [platform-folders] update version to 4.2.0 * update version * fix osx * vdb --- ports/platform-folders/portfile.cmake | 17 ++++++++--------- ports/platform-folders/vcpkg.json | 15 +++++++++++++-- versions/baseline.json | 2 +- versions/p-/platform-folders.json | 5 +++++ 4 files changed, 27 insertions(+), 12 deletions(-) diff --git a/ports/platform-folders/portfile.cmake b/ports/platform-folders/portfile.cmake index f7832767d7..9cb354f575 100644 --- a/ports/platform-folders/portfile.cmake +++ b/ports/platform-folders/portfile.cmake @@ -4,19 +4,18 @@ set(TARGET_BUILD_PATH "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}") vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO sago007/PlatformFolders - REF 4.1.0 - SHA512 B2C7983399D9EAA8EF95F45E51B7B70626466FC14A0E53C8B497E683D63E40683CC995C75FC9529C7E969BB802CF9C92051B663901326985722AEBF7618C48EB + REF 4.2.0 + SHA512 50a9acd37b8b491e8938190b3b7ed1af2d3cc70bb6e59708dc1928269d5e4b8d52ec02f9330f3d9439099029ac61d193dadbca198e1d561432e02e488e103f7c HEAD_REF master ) -vcpkg_configure_cmake( +vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" - PREFER_NINJA OPTIONS - -DBUILD_TESTING=OFF + -DPLATFORMFOLDERS_BUILD_TESTING=OFF ) -vcpkg_install_cmake() +vcpkg_cmake_install() if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/bin") file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/debug/bin") @@ -25,12 +24,12 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) endif() if (VCPKG_TARGET_IS_WINDOWS OR VCPKG_TARGET_IS_UWP OR VCPKG_TARGET_IS_MinGW) - vcpkg_fixup_cmake_targets(CONFIG_PATH cmake/ TARGET_PATH /share/platform_folders) + vcpkg_cmake_config_fixup(PACKAGE_NAME platform_folders CONFIG_PATH cmake) else() - vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/ TARGET_PATH /share/) + vcpkg_cmake_config_fixup(PACKAGE_NAME platform_folders CONFIG_PATH lib/cmake) endif() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") vcpkg_copy_pdbs() diff --git a/ports/platform-folders/vcpkg.json b/ports/platform-folders/vcpkg.json index 48230b0469..ac2e0c27ed 100644 --- a/ports/platform-folders/vcpkg.json +++ b/ports/platform-folders/vcpkg.json @@ -1,6 +1,17 @@ { "name": "platform-folders", - "version": "4.1.0", + "version": "4.2.0", "description": "A C++ library to look for special directories like \"My Documents\" and \"%APPDATA%\"", - "homepage": "https://github.com/sago007/PlatformFolders" + "homepage": "https://github.com/sago007/PlatformFolders", + "license": "MIT", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/versions/baseline.json b/versions/baseline.json index 58dbeba0f2..d870fbbd22 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5953,7 +5953,7 @@ "port-version": 0 }, "platform-folders": { - "baseline": "4.1.0", + "baseline": "4.2.0", "port-version": 0 }, "plf-colony": { diff --git a/versions/p-/platform-folders.json b/versions/p-/platform-folders.json index d2de2cafd2..bd92441933 100644 --- a/versions/p-/platform-folders.json +++ b/versions/p-/platform-folders.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8448d41ddd7f2f2302c9a6a80dde44bb8494b096", + "version": "4.2.0", + "port-version": 0 + }, { "git-tree": "8bb2bb2c54727cd2fa9b97a09313b1589e8f4e03", "version": "4.1.0",