From c63534efea5e838086f367f41b84a5e93a09b887 Mon Sep 17 00:00:00 2001 From: luncliff Date: Fri, 29 Sep 2023 21:43:35 +0900 Subject: [PATCH 1/2] [zenny-atomic] use 'vcpkg-cmake' host port --- ports/zenny-atomic/portfile.cmake | 10 +++++----- ports/zenny-atomic/vcpkg.json | 9 ++++++++- 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/ports/zenny-atomic/portfile.cmake b/ports/zenny-atomic/portfile.cmake index 7c07fb01..d31d5712 100644 --- a/ports/zenny-atomic/portfile.cmake +++ b/ports/zenny-atomic/portfile.cmake @@ -6,10 +6,10 @@ vcpkg_from_github( REF cce17a78911a43e9f963c31d172b2deee56f826e SHA512 db540b661ac42be33829f790f0d4a7084ece20ddec829b37fa2d4d2a6a15bead7a0b0475bb31b4cba9168224b3d0c2292f9dbf1fbf3a2d2a49e9466acb4c9387 ) -file(COPY ${CURRENT_PORT_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) +file(COPY "${CURRENT_PORT_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") -vcpkg_configure_cmake(SOURCE_PATH ${SOURCE_PATH}) -vcpkg_install_cmake() +vcpkg_cmake_configure(SOURCE_PATH "${SOURCE_PATH}") +vcpkg_cmake_install() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/zenny-atomic/vcpkg.json b/ports/zenny-atomic/vcpkg.json index 5e5e764d..119877b5 100644 --- a/ports/zenny-atomic/vcpkg.json +++ b/ports/zenny-atomic/vcpkg.json @@ -1,8 +1,15 @@ { "name": "zenny-atomic", "version-date": "2021-10-15", + "port-version": 1, "description": "Simple , and implementation for MSVC in Visual Studio 2019", "homepage": "https://github.com/zenny-chen/simple-stdatomic-for-VS-Clang", "license": "Apache-2.0", - "supports": "windows" + "supports": "windows", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ] } From c3a93ff7a5484f53d14c1a781c5b5e760a793a08 Mon Sep 17 00:00:00 2001 From: luncliff Date: Fri, 29 Sep 2023 21:43:54 +0900 Subject: [PATCH 2/2] [zenny-atomic] update baseline --- versions/baseline.json | 2 +- versions/z-/zenny-atomic.json | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/versions/baseline.json b/versions/baseline.json index 729a991f..0d095081 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -118,7 +118,7 @@ }, "zenny-atomic": { "baseline": "2021-10-15", - "port-version": 0 + "port-version": 1 }, "zlib-ng": { "baseline": "2.0.7", diff --git a/versions/z-/zenny-atomic.json b/versions/z-/zenny-atomic.json index d5865026..95a87826 100644 --- a/versions/z-/zenny-atomic.json +++ b/versions/z-/zenny-atomic.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0877339a1290d5eb58c75647015dbf309fd4bf88", + "version-date": "2021-10-15", + "port-version": 1 + }, { "git-tree": "b6fcda91ac8276525056a95132c3563052b9532a", "version-date": "2021-10-15",