From 53456892f3e484deebb1bc2876940e69dcb0d63a Mon Sep 17 00:00:00 2001 From: k <22292600+k-128@users.noreply.github.com> Date: Fri, 24 Jun 2022 00:07:17 +0200 Subject: [PATCH] [zeromq] Fix mingw build issues (24711) (#24782) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Fix zeromq mingw build issues * upd. zeromq port version (5 to 6) * upd. zeromq version files * Made dynamically set and declared flags based on VCPKG_LIBRARY_LINKAGE more explicit * Update version database * I mean * version * Update ports/zeromq/portfile.cmake Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com> * upd. zeromq version * revert WITH_PERF_TOOLS changes * upd. zeromq version * reset zeromq BUILD_TESTS option to ZMQ_BUILD_TESTS CACHE var * upd. zeromq version Co-authored-by: JackBoosY Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com> --- ports/zeromq/portfile.cmake | 6 ++++-- ports/zeromq/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/z-/zeromq.json | 5 +++++ 4 files changed, 11 insertions(+), 4 deletions(-) diff --git a/ports/zeromq/portfile.cmake b/ports/zeromq/portfile.cmake index 671fc2ed646..041e7b88cba 100644 --- a/ports/zeromq/portfile.cmake +++ b/ports/zeromq/portfile.cmake @@ -20,9 +20,9 @@ vcpkg_check_features( websockets-sha1 ENABLE_WS ) -set(PLATFORM_OPTIONS) +set(PLATFORM_OPTIONS "") if(VCPKG_TARGET_IS_MINGW) - set(PLATFORM_OPTIONS "-DCMAKE_SYSTEM_VERSION=6.0") + set(PLATFORM_OPTIONS -DCMAKE_SYSTEM_VERSION=6.0 -DZMQ_HAVE_IPC=0) endif() vcpkg_cmake_configure( @@ -39,6 +39,8 @@ vcpkg_cmake_configure( ${PLATFORM_OPTIONS} OPTIONS_DEBUG "-DCMAKE_PDB_OUTPUT_DIRECTORY=${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg" + MAYBE_UNUSED_VARIABLES + USE_PERF_TOOLS ) vcpkg_cmake_install() diff --git a/ports/zeromq/vcpkg.json b/ports/zeromq/vcpkg.json index e3f4426db26..06da0f09a89 100644 --- a/ports/zeromq/vcpkg.json +++ b/ports/zeromq/vcpkg.json @@ -1,7 +1,7 @@ { "name": "zeromq", "version": "4.3.4", - "port-version": 5, + "port-version": 6, "description": "The ZeroMQ lightweight messaging kernel is a library which extends the standard socket interfaces with features traditionally provided by specialised messaging middleware products", "homepage": "https://github.com/zeromq/libzmq", "license": "LGPL-3.0-only", diff --git a/versions/baseline.json b/versions/baseline.json index 0baa6775acb..2ddd847714c 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7786,7 +7786,7 @@ }, "zeromq": { "baseline": "4.3.4", - "port-version": 5 + "port-version": 6 }, "zfp": { "baseline": "0.5.5", diff --git a/versions/z-/zeromq.json b/versions/z-/zeromq.json index 03d110f382c..da9f561a804 100644 --- a/versions/z-/zeromq.json +++ b/versions/z-/zeromq.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7bdd3a27ea013a2d3b70032245631f114198cce9", + "version": "4.3.4", + "port-version": 6 + }, { "git-tree": "246f585e58f536087c5f70f918459d5500a4dc43", "version": "4.3.4",