diff options
| author | chausner <15180557+chausner@users.noreply.github.com> | 2021-09-28 06:01:49 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-27 21:01:49 -0700 |
| commit | eb43f6fda78829d579d09a7747ab84d4e01afdef (patch) | |
| tree | 2384b22e431ab12cf3f924d21837b6e201137905 | |
| parent | 83f11fd9882516fa5cb3092875ff56d99fa38f1f (diff) | |
| download | vcpkg-eb43f6fda78829d579d09a7747ab84d4e01afdef.tar.gz vcpkg-eb43f6fda78829d579d09a7747ab84d4e01afdef.zip | |
[platform-folders] Update to 4.1.0 (#20362)
* Update platform-folders to 4.1.0
* Update CI baseline
* Apply suggestions from code review
Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com>
* Update git-tree hash
Co-authored-by: chausner <chausner@users.noreply.github.com>
Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com>
| -rw-r--r-- | ports/platform-folders/portfile.cmake | 24 | ||||
| -rw-r--r-- | ports/platform-folders/vcpkg.json | 6 | ||||
| -rw-r--r-- | versions/baseline.json | 4 | ||||
| -rw-r--r-- | versions/p-/platform-folders.json | 5 |
4 files changed, 22 insertions, 17 deletions
diff --git a/ports/platform-folders/portfile.cmake b/ports/platform-folders/portfile.cmake index 6b2344db6..f7832767d 100644 --- a/ports/platform-folders/portfile.cmake +++ b/ports/platform-folders/portfile.cmake @@ -1,36 +1,36 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) -set(TARGET_BUILD_PATH ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}) +set(TARGET_BUILD_PATH "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}") vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO sago007/PlatformFolders - REF 4.0.0 - SHA512 89bd9b971cff55ddb051ffcf2e1bbf1678ec14c601916d65ebd4d8e46a79cf93f12cbe9c13ebd0417808f35d7031d13274cda78f009a26fbd19d71e13a5e5ac6 + REF 4.1.0 + SHA512 B2C7983399D9EAA8EF95F45E51B7B70626466FC14A0E53C8B497E683D63E40683CC995C75FC9529C7E969BB802CF9C92051B663901326985722AEBF7618C48EB HEAD_REF master ) vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} + SOURCE_PATH "${SOURCE_PATH}" PREFER_NINJA OPTIONS - -DBUILD_TESTING=OFF + -DBUILD_TESTING=OFF ) vcpkg_install_cmake() if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) - file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/bin) - file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/debug/bin) - file(INSTALL ${TARGET_BUILD_PATH}-rel/platform_folders.dll DESTINATION ${CURRENT_PACKAGES_DIR}/bin/) - file(INSTALL ${TARGET_BUILD_PATH}-dbg/platform_folders.dll DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin/) + file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/bin") + file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/debug/bin") + file(INSTALL "${TARGET_BUILD_PATH}-rel/platform_folders.dll" DESTINATION "${CURRENT_PACKAGES_DIR}/bin/") + file(INSTALL "${TARGET_BUILD_PATH}-dbg/platform_folders.dll" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin/") endif() -if (NOT VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore" OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "MinGW") +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) else() vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/ TARGET_PATH /share/) endif() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/platform-folders RENAME copyright) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) vcpkg_copy_pdbs() diff --git a/ports/platform-folders/vcpkg.json b/ports/platform-folders/vcpkg.json index e0f57ccac..48230b046 100644 --- a/ports/platform-folders/vcpkg.json +++ b/ports/platform-folders/vcpkg.json @@ -1,6 +1,6 @@ { "name": "platform-folders", - "version-string": "4.0.0", - "port-version": 7, - "description": "A C++ library to look for special directories like \"My Documents\" and \"%APPDATA%\"" + "version": "4.1.0", + "description": "A C++ library to look for special directories like \"My Documents\" and \"%APPDATA%\"", + "homepage": "https://github.com/sago007/PlatformFolders" } diff --git a/versions/baseline.json b/versions/baseline.json index ad8484744..3b3b0670f 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5121,8 +5121,8 @@ "port-version": 0 }, "platform-folders": { - "baseline": "4.0.0", - "port-version": 7 + "baseline": "4.1.0", + "port-version": 0 }, "plf-colony": { "baseline": "6.28", diff --git a/versions/p-/platform-folders.json b/versions/p-/platform-folders.json index 54763549e..d2de2cafd 100644 --- a/versions/p-/platform-folders.json +++ b/versions/p-/platform-folders.json @@ -1,6 +1,11 @@ { "versions": [ { + "git-tree": "8bb2bb2c54727cd2fa9b97a09313b1589e8f4e03", + "version": "4.1.0", + "port-version": 0 + }, + { "git-tree": "86a7b50a14bdd41de268fedb24601eeb94661ebb", "version-string": "4.0.0", "port-version": 7 |