From b93bcd6cb495607901939518fd6a41b5d55826ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kasper=20Isager=20Dalsgar=C3=B0?= Date: Fri, 9 Feb 2024 09:36:39 +0100 Subject: [PATCH] Adjust linking configuration (#174) --- CMakeLists.txt | 16 +++++++++------- vendor/libuv | 2 +- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 375db9c1..d626b41d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.22) +cmake_minimum_required(VERSION 3.25) project(udx C) @@ -15,14 +15,14 @@ set_target_properties( POSITION_INDEPENDENT_CODE ON ) -if(WIN32) - target_compile_options(udx PRIVATE /W4) -endif() - if(UNIX) target_compile_options(udx PRIVATE -Wall -Wextra) endif() +if(WIN32) + target_compile_options(udx PRIVATE /W4) +endif() + target_sources( udx INTERFACE @@ -61,7 +61,7 @@ if(WIN32) ) endif() -add_library(udx_shared SHARED $) +add_library(udx_shared SHARED) set_target_properties( udx_shared @@ -73,6 +73,7 @@ set_target_properties( target_link_libraries( udx_shared PUBLIC + udx uv ) @@ -84,7 +85,7 @@ if(UNIX) ) endif() -add_library(udx_static STATIC $) +add_library(udx_static STATIC) set_target_properties( udx_static @@ -95,6 +96,7 @@ set_target_properties( target_link_libraries( udx_static PUBLIC + udx uv_a ) diff --git a/vendor/libuv b/vendor/libuv index 988f2bfc..e9f29cb9 160000 --- a/vendor/libuv +++ b/vendor/libuv @@ -1 +1 @@ -Subproject commit 988f2bfc4defb9a85a536a3e645834c161143ee0 +Subproject commit e9f29cb984231524e3931aa0ae2c5dae1a32884e