MSVC build: don't use prebuilt libuv and libzmq

SChernykh · Feb 18, 2025 · a211e51 · a211e51
1 parent a80d5eb
commit a211e51
Show file tree

Hide file tree

Showing 12 changed files with 46 additions and 10 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -34,6 +34,28 @@ if (CMAKE_CXX_COMPILER_ID MATCHES MSVC)
 	set(CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION 10.0)
 endif()
 
+if (CMAKE_CXX_COMPILER_ID MATCHES MSVC)
+	set(BUILD_TESTING OFF CACHE BOOL "")
+	set(LIBUV_BUILD_SHARED OFF CACHE BOOL "")
+	set(WITH_LIBSODIUM OFF CACHE BOOL "")
+	set(WITH_LIBBSD OFF CACHE BOOL "")
+	set(BUILD_TESTS OFF CACHE BOOL "")
+	set(ZMQ_HAVE_IPC OFF CACHE BOOL "")
+	set(WITH_DOCS OFF CACHE BOOL "")
+	set(ENABLE_DRAFTS OFF CACHE BOOL "")
+	set(BUILD_SHARED OFF CACHE BOOL "")
+	set(ENABLE_CLANG OFF CACHE BOOL "")
+
+	add_subdirectory(external/src/libuv)
+	add_subdirectory(external/src/libzmq)
+
+	set(UV_LIBRARY_DEBUG uv_a)
+	set(UV_LIBRARY uv_a)
+
+	set(ZMQ_LIBRARY_DEBUG libzmq-static)
+	set(ZMQ_LIBRARY libzmq-static)
+endif()
+
 if (WITH_GRPC)
 	add_definitions(-DWITH_GRPC)
 	include(cmake/grpc.cmake)
@@ -234,10 +256,6 @@ elseif (NOT APPLE)
 endif()
 
 if (CMAKE_CXX_COMPILER_ID MATCHES MSVC)
-	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")
 	if (WITH_TLS)
 		find_library(CURL_LIBRARY_DEBUG NAMES libcurl-d PATHS "external/lib/libcurl_tls/Debug")
 		find_library(CURL_LIBRARY NAMES libcurl PATHS "external/lib/libcurl_tls/Release")

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_6.lib b/external/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_6.lib b/external/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/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
@@ -18,6 +18,28 @@ set(INSTALL_GTEST OFF CACHE BOOL "Enable installation of googletest. (Projects e
 add_subdirectory(googletest)
 set(LIBS gtest)
 
+if (CMAKE_CXX_COMPILER_ID MATCHES MSVC)
+	set(BUILD_TESTING OFF CACHE BOOL "")
+	set(LIBUV_BUILD_SHARED OFF CACHE BOOL "")
+	set(WITH_LIBSODIUM OFF CACHE BOOL "")
+	set(WITH_LIBBSD OFF CACHE BOOL "")
+	set(BUILD_TESTS OFF CACHE BOOL "")
+	set(ZMQ_HAVE_IPC OFF CACHE BOOL "")
+	set(WITH_DOCS OFF CACHE BOOL "")
+	set(ENABLE_DRAFTS OFF CACHE BOOL "")
+	set(BUILD_SHARED OFF CACHE BOOL "")
+	set(ENABLE_CLANG OFF CACHE BOOL "")
+
+	add_subdirectory(../external/src/libuv libuv)
+	add_subdirectory(../external/src/libzmq libzmq)
+
+	set(UV_LIBRARY_DEBUG uv_a)
+	set(UV_LIBRARY uv_a)
+
+	set(ZMQ_LIBRARY_DEBUG libzmq-static)
+	set(ZMQ_LIBRARY libzmq-static)
+endif()
+
 add_subdirectory(../external/src/RandomX RandomX)
 set(LIBS ${LIBS} randomx)
 add_definitions(-DWITH_RANDOMX)
@@ -137,10 +159,6 @@ 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_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_tls/Debug")
 		find_library(CURL_LIBRARY NAMES libcurl PATHS "../external/lib/libcurl_tls/Release")
 		add_definitions(-D_DISABLE_VECTOR_ANNOTATION)