mirror/vcpkg
1
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2025-01-18 20:03:02 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

[zeromq] Fix mingw build issues (24711) (#24782)

Browse Source 
* 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 <yuzaiyang@beyondsoft.com>
Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com>
This commit is contained in:
k 2022-06-24 00:07:17 +02:00 committed by GitHub
parent 59aa3a9eec
commit 53456892f3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ports/zeromq/portfile.cmake
View File

@ -20,9 +20,9 @@ vcpkg_check_features(
websockets-sha1 ENABLE_WS websockets-sha1 ENABLE_WS
) )
set(PLATFORM_OPTIONS) set(PLATFORM_OPTIONS "")
if(VCPKG_TARGET_IS_MINGW) 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() endif()
vcpkg_cmake_configure( vcpkg_cmake_configure(
@ -39,6 +39,8 @@ vcpkg_cmake_configure(
${PLATFORM_OPTIONS} ${PLATFORM_OPTIONS}
OPTIONS_DEBUG OPTIONS_DEBUG
"-DCMAKE_PDB_OUTPUT_DIRECTORY=${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg" "-DCMAKE_PDB_OUTPUT_DIRECTORY=${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg"
MAYBE_UNUSED_VARIABLES
USE_PERF_TOOLS
) )
vcpkg_cmake_install() vcpkg_cmake_install()

2
ports/zeromq/vcpkg.json
View File

@ -1,7 +1,7 @@
{ {
"name": "zeromq", "name": "zeromq",
"version": "4.3.4", "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", "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", "homepage": "https://github.com/zeromq/libzmq",
"license": "LGPL-3.0-only", "license": "LGPL-3.0-only",

2
versions/baseline.json
View File

@ -7786,7 +7786,7 @@
}, },
"zeromq": { "zeromq": {
"baseline": "4.3.4", "baseline": "4.3.4",
"port-version": 5 "port-version": 6
}, },
"zfp": { "zfp": {
"baseline": "0.5.5", "baseline": "0.5.5",

5
versions/z-/zeromq.json
View File

@ -1,5 +1,10 @@
{ {
"versions": [ "versions": [
{
"git-tree": "7bdd3a27ea013a2d3b70032245631f114198cce9",
"version": "4.3.4",
"port-version": 6
},
{ {
"git-tree": "246f585e58f536087c5f70f918459d5500a4dc43", "git-tree": "246f585e58f536087c5f70f918459d5500a4dc43",
"version": "4.3.4", "version": "4.3.4",