mirror of https://github.com/microsoft/vcpkg.git
[zyre] update to 2025-06-25 (#49143)
Co-authored-by: Victor Romero <romerosanchezv@gmail.com>
This commit is contained in:
parent
826b8d0525
commit
5cf3e4b24e
|
|
@ -0,0 +1,15 @@
|
|||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index d51cba0..301679d 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -484,7 +484,9 @@ if (CZMQ_BUILD_STATIC)
|
||||
target_compile_definitions(czmq-static
|
||||
PUBLIC CZMQ_STATIC
|
||||
)
|
||||
-
|
||||
+ if(ANDROID)
|
||||
+ target_link_libraries(czmq-static PRIVATE log)
|
||||
+ endif()
|
||||
endif()
|
||||
|
||||
|
||||
|
|
@ -6,6 +6,7 @@ vcpkg_from_github(
|
|||
HEAD_REF master
|
||||
PATCHES
|
||||
fix-dependencies.patch
|
||||
link-log-on-android.patch
|
||||
)
|
||||
|
||||
foreach(_cmake_module
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
{
|
||||
"name": "czmq",
|
||||
"version-semver": "4.2.1",
|
||||
"port-version": 4,
|
||||
"port-version": 5,
|
||||
"description": "High-level C binding for ZeroMQ",
|
||||
"homepage": "https://github.com/zeromq/czmq",
|
||||
"license": "MPL-2.0",
|
||||
|
|
|
|||
|
|
@ -0,0 +1,32 @@
|
|||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 76725b0..70f7ad3 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -303,9 +303,6 @@ if (ZYRE_BUILD_STATIC)
|
||||
|
||||
endif()
|
||||
|
||||
-
|
||||
-include(${CMAKE_CURRENT_SOURCE_DIR}/src/CMakeLists-local.txt) # Optional project-local hook
|
||||
-
|
||||
########################################################################
|
||||
# pkgconfig
|
||||
########################################################################
|
||||
@@ -501,7 +498,7 @@ target_link_libraries(
|
||||
${OPTIONAL_LIBRARIES_STATIC}
|
||||
)
|
||||
endif()
|
||||
-
|
||||
+if(0)
|
||||
########################################################################
|
||||
# tests
|
||||
########################################################################
|
||||
@@ -570,7 +567,7 @@ foreach(TEST_CLASS ${TEST_CLASSES})
|
||||
endforeach(TEST_CLASS)
|
||||
|
||||
include(CTest)
|
||||
-
|
||||
+endif()
|
||||
########################################################################
|
||||
# cleanup
|
||||
########################################################################
|
||||
|
|
@ -4,6 +4,8 @@ vcpkg_from_github(
|
|||
REF f2fd7252322b1b52be248b9ef96f8981de3b86ff
|
||||
SHA512 64502b4d1ca4296eb979a67f6058a80e931bb6db0cb29b94f6cb3285efe9a216e0014ea379a4018004f9354369bb98e5160474263568a825842e1e4d83a74225
|
||||
HEAD_REF master
|
||||
PATCHES
|
||||
disable-examples-tests.patch
|
||||
)
|
||||
|
||||
configure_file(
|
||||
|
|
@ -23,6 +25,15 @@ endforeach()
|
|||
string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" ZYRE_BUILD_SHARED)
|
||||
string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" ZYRE_BUILD_STATIC)
|
||||
|
||||
set(RUNTIME_FLAGS)
|
||||
if(VCPKG_TARGET_IS_WINDOWS)
|
||||
if(VCPKG_CRT_LINKAGE STREQUAL "dynamic")
|
||||
list(APPEND RUNTIME_FLAGS -DCMAKE_MSVC_RUNTIME_LIBRARY=MultiThreaded$$<$$<CONFIG:Debug>:Debug>DLL)
|
||||
else()
|
||||
list(APPEND RUNTIME_FLAGS -DCMAKE_MSVC_RUNTIME_LIBRARY=MultiThreaded$$<$$<CONFIG:Debug>:Debug>)
|
||||
endif()
|
||||
endif()
|
||||
|
||||
vcpkg_cmake_configure(
|
||||
SOURCE_PATH "${SOURCE_PATH}"
|
||||
DISABLE_PARALLEL_CONFIGURE
|
||||
|
|
@ -30,6 +41,7 @@ vcpkg_cmake_configure(
|
|||
-DZYRE_BUILD_SHARED=${ZYRE_BUILD_SHARED}
|
||||
-DZYRE_BUILD_STATIC=${ZYRE_BUILD_STATIC}
|
||||
-DENABLE_DRAFTS=OFF
|
||||
${RUNTIME_FLAGS}
|
||||
)
|
||||
|
||||
vcpkg_cmake_install()
|
||||
|
|
@ -40,6 +52,8 @@ if(EXISTS "${CURRENT_PACKAGES_DIR}/CMake")
|
|||
vcpkg_cmake_config_fixup(CONFIG_PATH CMake)
|
||||
elseif(EXISTS "${CURRENT_PACKAGES_DIR}/share/cmake/${PORT}")
|
||||
vcpkg_cmake_config_fixup(CONFIG_PATH share/cmake/${PORT})
|
||||
elseif(EXISTS "${CURRENT_PACKAGES_DIR}/lib/cmake/${PORT}")
|
||||
vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/${PORT})
|
||||
endif()
|
||||
|
||||
file(COPY
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "zyre",
|
||||
"version-date": "2024-04-10",
|
||||
"version-date": "2025-06-25",
|
||||
"description": "An open-source framework for proximity-based peer-to-peer applications",
|
||||
"homepage": "https://github.com/zeromq/zyre",
|
||||
"dependencies": [
|
||||
|
|
|
|||
|
|
@ -744,7 +744,6 @@ zookeeper:x64-windows-static=fail
|
|||
zookeeper:x64-windows=fail
|
||||
zookeeper:x86-windows=fail
|
||||
zyre:arm64-windows-static-md=fail
|
||||
zyre:x64-windows-static-md=fail
|
||||
|
||||
# Ports which needs to pass in CI
|
||||
cmake:arm64-osx=pass
|
||||
|
|
|
|||
|
|
@ -261,7 +261,6 @@ zookeeper:x64-windows-static-md=fail
|
|||
zookeeper:x64-windows-static=fail
|
||||
zookeeper:x64-windows=fail
|
||||
zookeeper:x86-windows=fail
|
||||
zyre:x64-windows-static-md=fail
|
||||
|
||||
|
||||
# testing all features would be too slow:
|
||||
|
|
|
|||
|
|
@ -2310,7 +2310,7 @@
|
|||
},
|
||||
"czmq": {
|
||||
"baseline": "4.2.1",
|
||||
"port-version": 4
|
||||
"port-version": 5
|
||||
},
|
||||
"d3d12-memory-allocator": {
|
||||
"baseline": "3.0.1",
|
||||
|
|
@ -10989,7 +10989,7 @@
|
|||
"port-version": 1
|
||||
},
|
||||
"zyre": {
|
||||
"baseline": "2024-04-10",
|
||||
"baseline": "2025-06-25",
|
||||
"port-version": 0
|
||||
},
|
||||
"zziplib": {
|
||||
|
|
|
|||
|
|
@ -1,5 +1,10 @@
|
|||
{
|
||||
"versions": [
|
||||
{
|
||||
"git-tree": "de2d2379b050f995744ffcc882c1d02795bd2120",
|
||||
"version-semver": "4.2.1",
|
||||
"port-version": 5
|
||||
},
|
||||
{
|
||||
"git-tree": "f2c4f3cb55eecf90232bdaabef1fd9b6d0426c7c",
|
||||
"version-semver": "4.2.1",
|
||||
|
|
|
|||
|
|
@ -1,5 +1,10 @@
|
|||
{
|
||||
"versions": [
|
||||
{
|
||||
"git-tree": "3dba03b87c289f848249485191a3c6b46fb623d0",
|
||||
"version-date": "2025-06-25",
|
||||
"port-version": 0
|
||||
},
|
||||
{
|
||||
"git-tree": "554cb1f667d38a75ddc7ce3e88f17ed0cace0805",
|
||||
"version-date": "2024-04-10",
|
||||
|
|
|
|||
Loading…
Reference in New Issue