[czmq] code clean up (microsoft#33650)

ndk · Sep 13, 2023 · e44d60e · e44d60e
1 parent 44e1ee7
commit e44d60e
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 8 deletions.
diff --git a/ports/czmq/portfile.cmake b/ports/czmq/portfile.cmake
@@ -62,11 +62,7 @@ file(COPY
     DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}"
 )
 
-if ("tool" IN_LIST FEATURES)
-    vcpkg_copy_tools(TOOL_NAMES zmakecert)
-endif()
-
-vcpkg_clean_executables_in_bin(FILE_NAMES zmakecert)
+vcpkg_copy_tools(TOOL_NAMES zmakecert AUTO_CLEAN)
 
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share")
 
@@ -84,4 +80,4 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL static)
 endif()
 
 # Handle copyright
-file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
diff --git a/ports/czmq/vcpkg.json b/ports/czmq/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "czmq",
   "version-semver": "4.2.1",
-  "port-version": 2,
+  "port-version": 3,
   "description": "High-level C binding for ZeroMQ",
   "homepage": "https://github.com/zeromq/czmq",
   "license": "MPL-2.0",

diff --git a/versions/baseline.json b/versions/baseline.json
@@ -2022,7 +2022,7 @@
     },
     "czmq": {
       "baseline": "4.2.1",
-      "port-version": 2
+      "port-version": 3
     },
     "d3d12-memory-allocator": {
       "baseline": "2021-05-05",

diff --git a/versions/c-/czmq.json b/versions/c-/czmq.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "ec9f27596e7ff9e8b8aa401f27525075abec28ea",
+      "version-semver": "4.2.1",
+      "port-version": 3
+    },
     {
       "git-tree": "5bebd4e3a17c277fc4813a24cbdde5d2a06ccc01",
       "version-semver": "4.2.1",