Updated dependencies

SChernykh · Jan 29, 2024 · 0d86108 · 0d86108
1 parent 7255578
commit 0d86108
Show file tree

Hide file tree

Showing 16 changed files with 9 additions and 7 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -194,8 +194,8 @@ elseif (NOT APPLE)
 endif()
 
 if (CMAKE_CXX_COMPILER_ID MATCHES MSVC)
-	find_library(ZMQ_LIBRARY_DEBUG NAMES libzmq-v142-mt-sgd-4_3_5 PATHS "external/lib/libzmq/Debug")
-	find_library(ZMQ_LIBRARY NAMES libzmq-v142-mt-s-4_3_5 PATHS "external/lib/libzmq/Release")
+	find_library(ZMQ_LIBRARY_DEBUG NAMES libzmq-v142-mt-sgd-4_3_6 PATHS "external/lib/libzmq/Debug")
+	find_library(ZMQ_LIBRARY NAMES libzmq-v142-mt-s-4_3_6 PATHS "external/lib/libzmq/Release")
 	find_library(UV_LIBRARY_DEBUG NAMES libuv PATHS "external/lib/libuv/Debug")
 	find_library(UV_LIBRARY NAMES libuv PATHS "external/lib/libuv/Release")
 	find_library(CURL_LIBRARY_DEBUG NAMES libcurl-d PATHS "external/lib/libcurl/Debug")

diff --git a/external/lib/libuv/Debug/libuv.lib b/external/lib/libuv/Debug/libuv.lib
diff --git a/external/lib/libuv/Debug/libuv.pdb b/external/lib/libuv/Debug/libuv.pdb
diff --git a/external/lib/libuv/Release/libuv.lib b/external/lib/libuv/Release/libuv.lib
diff --git a/external/lib/libuv/Release/libuv.pdb b/external/lib/libuv/Release/libuv.pdb
diff --git a/external/lib/libzmq/Debug/libzmq-v142-mt-sgd-4_3_5.pdb b/external/lib/libzmq/Debug/libzmq-v142-mt-sgd-4_3_5.pdb
diff --git a/...libzmq/Debug/libzmq-v142-mt-sgd-4_3_5.lib → ...libzmq/Debug/libzmq-v142-mt-sgd-4_3_6.lib b/...libzmq/Debug/libzmq-v142-mt-sgd-4_3_5.lib → ...libzmq/Debug/libzmq-v142-mt-sgd-4_3_6.lib
diff --git a/external/lib/libzmq/Debug/libzmq-v142-mt-sgd-4_3_6.pdb b/external/lib/libzmq/Debug/libzmq-v142-mt-sgd-4_3_6.pdb
diff --git a/external/lib/libzmq/Release/libzmq-v142-mt-s-4_3_5.pdb b/external/lib/libzmq/Release/libzmq-v142-mt-s-4_3_5.pdb
diff --git a/...libzmq/Release/libzmq-v142-mt-s-4_3_5.lib → ...libzmq/Release/libzmq-v142-mt-s-4_3_6.lib b/...libzmq/Release/libzmq-v142-mt-s-4_3_5.lib → ...libzmq/Release/libzmq-v142-mt-s-4_3_6.lib
diff --git a/external/lib/libzmq/Release/libzmq-v142-mt-s-4_3_6.pdb b/external/lib/libzmq/Release/libzmq-v142-mt-s-4_3_6.pdb
diff --git a/external/src/cppzmq b/external/src/cppzmq
diff --git a/external/src/libuv b/external/src/libuv
diff --git a/external/src/libzmq b/external/src/libzmq
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
@@ -120,8 +120,8 @@ if (STATIC_LIBS)
 	set(CURL_LIBRARY "${CMAKE_SOURCE_DIR}/../external/src/curl/lib/.libs/libcurl.a")
 else()
 	if (CMAKE_CXX_COMPILER_ID MATCHES MSVC)
-		find_library(ZMQ_LIBRARY_DEBUG NAMES libzmq-v142-mt-sgd-4_3_5 PATHS "../external/lib/libzmq/Debug")
-		find_library(ZMQ_LIBRARY NAMES libzmq-v142-mt-s-4_3_5 PATHS "../external/lib/libzmq/Release")
+		find_library(ZMQ_LIBRARY_DEBUG NAMES libzmq-v142-mt-sgd-4_3_6 PATHS "../external/lib/libzmq/Debug")
+		find_library(ZMQ_LIBRARY NAMES libzmq-v142-mt-s-4_3_6 PATHS "../external/lib/libzmq/Release")
 		find_library(UV_LIBRARY_DEBUG NAMES libuv PATHS "../external/lib/libuv/Debug")
 		find_library(UV_LIBRARY NAMES libuv PATHS "../external/lib/libuv/Release")
 		find_library(CURL_LIBRARY_DEBUG NAMES libcurl-d PATHS "../external/lib/libcurl/Debug")

diff --git a/tests/src/check_win7.py b/tests/src/check_win7.py
@@ -259,6 +259,8 @@
 	"InitializeSecurityDescriptor",
 	"BCryptGenRandom",
 	"GetConsoleCP",
+	"DeleteFileW",
+	"GetTempPathW",
 }
 
 f = open(sys.argv[1], 'r')
+11 −29		.github/workflows/ci.yml
+1 −1		examples/CMakeLists.txt
+84 −0		tests/active_poller.cpp
+95 −3		tests/monitor.cpp
+15 −0		tests/poller.cpp
+131 −103		zmq.hpp
+100 −5		zmq_addon.hpp