From c74a65b28b6ef5dae07111a3bf7fd573ad32f96f Mon Sep 17 00:00:00 2001 From: Webster Sheets Date: Fri, 27 Jan 2023 00:07:33 -0500 Subject: [PATCH] Update nanosockets/CMakeLists.txt --- contrib/nanosockets/CMakeLists.txt | 27 ++++++--------------------- src/core/CMakeLists.txt | 2 +- 2 files changed, 7 insertions(+), 22 deletions(-) diff --git a/contrib/nanosockets/CMakeLists.txt b/contrib/nanosockets/CMakeLists.txt index 9b45d8cebc8..fe6cf21ce03 100644 --- a/contrib/nanosockets/CMakeLists.txt +++ b/contrib/nanosockets/CMakeLists.txt @@ -1,31 +1,16 @@ -cmake_minimum_required(VERSION 2.6) +cmake_minimum_required(VERSION 3.1) project(nanosockets C) -set(NANOSOCKETS_STATIC "0" CACHE BOOL "Create a static library") -set(NANOSOCKETS_SHARED "0" CACHE BOOL "Create a shared library") - if (MSYS OR MINGW) - set(CMAKE_C_FLAGS "-static") + set(CMAKE_C_FLAGS "-static") add_definitions(-DWINVER=0x0601) add_definitions(-D_WIN32_WINNT=0x0601) endif() -if (NANOSOCKETS_STATIC) - add_library(nanosockets_static STATIC nanosockets.c ${SOURCES}) - - if (NOT UNIX) - target_link_libraries(nanosockets_static ws2_32) - SET_TARGET_PROPERTIES(nanosockets_static PROPERTIES PREFIX "") - endif() -endif() - -if (NANOSOCKETS_SHARED) - add_definitions(-DNANOSOCKETS_DLL) - add_library(nanosockets SHARED nanosockets.c ${SOURCES}) +add_library(nanosockets STATIC nanosockets.c ${SOURCES}) - if (NOT UNIX) - target_link_libraries(nanosockets ws2_32) - SET_TARGET_PROPERTIES(nanosockets PROPERTIES PREFIX "") - endif() +if (NOT UNIX) + target_link_libraries(nanosockets ws2_32) + SET_TARGET_PROPERTIES(nanosockets PROPERTIES PREFIX "") endif() diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt index df67860531c..630ee6f6207 100644 --- a/src/core/CMakeLists.txt +++ b/src/core/CMakeLists.txt @@ -15,4 +15,4 @@ target_link_libraries(pioneer-core PUBLIC profiler lz4 fmt::fmt - nanosockets_static) + nanosockets)