[czmq] Delete "headers" that should not be installed (#24434)

See: zeromq/czmq#2197 Related: #24433
microsoft · Apr 27, 2022 · 474f736 · 474f736
1 parent fb02a78
commit 474f736
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 1 deletion.
diff --git a/ports/czmq/portfile.cmake b/ports/czmq/portfile.cmake
@@ -70,6 +70,12 @@ vcpkg_clean_executables_in_bin(FILE_NAMES zmakecert)
 
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share")
 
+# Remove headers with "common" names that conflict with other packages which aren't intended to be installed
+# See https://github.com/zeromq/czmq/issues/2197
+foreach(FILE readme.txt sha1.h sha1.inc_c slre.h slre.inc_c zgossip_engine.inc zgossip_msg.h zhash_primes.inc zsock_option.inc)
+    file(REMOVE "${CURRENT_PACKAGES_DIR}/include/${FILE}")
+endforeach()
+
 if(VCPKG_LIBRARY_LINKAGE STREQUAL static)
     vcpkg_replace_string(${CURRENT_PACKAGES_DIR}/include/czmq_library.h
         "if defined CZMQ_STATIC"

diff --git a/ports/czmq/vcpkg.json b/ports/czmq/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "czmq",
   "version-semver": "4.2.1",
+  "port-version": 1,
   "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
@@ -1762,7 +1762,7 @@
     },
     "czmq": {
       "baseline": "4.2.1",
-      "port-version": 0
+      "port-version": 1
     },
     "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": "fd4ccb9b894541d10e393139468aaac97419b0f2",
+      "version-semver": "4.2.1",
+      "port-version": 1
+    },
     {
       "git-tree": "e05dc72cf3b616b1fd6629ea3dc20d08ed8d8055",
       "version-semver": "4.2.1",