From e0b05c21df2bc8ff40a7e43401d164120f7baaa4 Mon Sep 17 00:00:00 2001 From: zEuS0390 Date: Sat, 11 Feb 2023 23:18:51 +0800 Subject: [PATCH] Fix MinGW build issue on example #2638 --- CMakeLists.txt | 5 ++--- include/spdlog/details/udp_client-windows.h | 10 ++++++---- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 61d21781..3a276a73 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -176,11 +176,10 @@ if(SPDLOG_SYSTEM_INCLUDES) set(SPDLOG_INCLUDES_LEVEL "SYSTEM") endif() - target_compile_definitions(spdlog PUBLIC SPDLOG_COMPILED_LIB) target_include_directories(spdlog ${SPDLOG_INCLUDES_LEVEL} PUBLIC "$" "$") -target_link_libraries(spdlog PUBLIC Threads::Threads) +target_link_libraries(spdlog PUBLIC Threads::Threads $<$: ws2_32>) spdlog_enable_warnings(spdlog) set_target_properties(spdlog PROPERTIES VERSION ${SPDLOG_VERSION} SOVERSION ${SPDLOG_VERSION_MAJOR}.${SPDLOG_VERSION_MINOR}) @@ -199,7 +198,7 @@ add_library(spdlog::spdlog_header_only ALIAS spdlog_header_only) target_include_directories(spdlog_header_only ${SPDLOG_INCLUDES_LEVEL} INTERFACE "$" "$") -target_link_libraries(spdlog_header_only INTERFACE Threads::Threads) +target_link_libraries(spdlog_header_only INTERFACE Threads::Threads $<$: ws2_32>) # --------------------------------------------------------------------------------------- # Use fmt package if using external fmt diff --git a/include/spdlog/details/udp_client-windows.h b/include/spdlog/details/udp_client-windows.h index 8e763356..7d25f037 100644 --- a/include/spdlog/details/udp_client-windows.h +++ b/include/spdlog/details/udp_client-windows.h @@ -15,9 +15,11 @@ #include #include -#pragma comment(lib, "Ws2_32.lib") -#pragma comment(lib, "Mswsock.lib") -#pragma comment(lib, "AdvApi32.lib") +#if defined(_MSC_VER) +# pragma comment(lib, "Ws2_32.lib") +# pragma comment(lib, "Mswsock.lib") +# pragma comment(lib, "AdvApi32.lib") +#endif namespace spdlog { namespace details { @@ -25,7 +27,7 @@ class udp_client { static constexpr int TX_BUFFER_SIZE = 1024 * 10; SOCKET socket_ = INVALID_SOCKET; - sockaddr_in addr_ = {0}; + sockaddr_in addr_ = {}; static void init_winsock_() {