tiamak/p2pool-monero
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MSVC build: don't use prebuilt libuv and libzmq

Browse Source
This commit is contained in:
SChernykh
2025-02-18 20:04:11 +01:00
parent a80d5eb540
commit 0936d6e4f0
12 changed files with 52 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CMakeLists.txt
+25 -6
View File
@@ -34,6 +34,31 @@ if (CMAKE_CXX_COMPILER_ID MATCHES MSVC)
set(CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION 10.0)
endif()
if (CMAKE_CXX_COMPILER_ID MATCHES MSVC)
add_definitions(-D_DISABLE_VECTOR_ANNOTATION)
add_definitions(-D_DISABLE_STRING_ANNOTATION)
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 +259,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")
@@ -245,8 +266,6 @@ if (CMAKE_CXX_COMPILER_ID MATCHES MSVC)
find_library(CURL_LIBRARY_DEBUG NAMES libcurl-d PATHS "external/lib/libcurl/Debug")
find_library(CURL_LIBRARY NAMES libcurl PATHS "external/lib/libcurl/Release")
endif()
add_definitions(-D_DISABLE_VECTOR_ANNOTATION)
add_definitions(-D_DISABLE_STRING_ANNOTATION)
elseif (CMAKE_CXX_COMPILER_ID MATCHES GNU OR CMAKE_CXX_COMPILER_ID MATCHES Clang)
find_library(ZMQ_LIBRARY_DEBUG NAMES zmq libzmq.a)
find_library(ZMQ_LIBRARY NAMES zmq libzmq.a)
external/lib/libuv/Debug/libuv.lib
Vendored
BIN
View File
Binary file not shown.
external/lib/libuv/Debug/libuv.pdb
Vendored
BIN
View File
Binary file not shown.
external/lib/libuv/Release/libuv.lib
Vendored
BIN
View File
Binary file not shown.
external/lib/libuv/Release/libuv.pdb
Vendored
BIN
View File
Binary file not shown.
external/lib/libzmq/Debug/libzmq-v142-mt-sgd-4_3_6.lib
Vendored
BIN
View File
Binary file not shown.
external/lib/libzmq/Debug/libzmq-v142-mt-sgd-4_3_6.pdb
Vendored
BIN
View File
Binary file not shown.
external/lib/libzmq/Release/libzmq-v142-mt-s-4_3_6.lib
Vendored
BIN
View File
Binary file not shown.
external/lib/libzmq/Release/libzmq-v142-mt-s-4_3_6.pdb
Vendored
BIN
View File
Binary file not shown.
external/src/libuv
Vendored
+1 -1
Submodule external/src/libuv updated: 6a486e0c7f...a43eeec023
external/src/libzmq
Vendored
+1 -1
Submodule external/src/libzmq updated: 34f7fa2202...b05020c66e
tests/CMakeLists.txt
+25 -6
View File
@@ -18,6 +18,31 @@ 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)
add_definitions(-D_DISABLE_VECTOR_ANNOTATION)
add_definitions(-D_DISABLE_STRING_ANNOTATION)
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,14 +162,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_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)
add_definitions(-D_DISABLE_STRING_ANNOTATION)
elseif (CMAKE_CXX_COMPILER_ID MATCHES GNU OR CMAKE_CXX_COMPILER_ID MATCHES Clang)
find_library(ZMQ_LIBRARY_DEBUG NAMES zmq libzmq.a)
find_library(ZMQ_LIBRARY NAMES zmq libzmq.a)