From 3d9e963ca43aae7f8f03b6378c554cd7e47aa9e3 Mon Sep 17 00:00:00 2001 From: Green Sky Date: Sun, 7 Apr 2024 11:02:12 +0200 Subject: [PATCH] small updates --- CMakeLists.txt | 2 +- external/CMakeLists.txt | 10 ---------- external/happyhttp/CMakeLists.txt | 3 +++ 3 files changed, 4 insertions(+), 11 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 944ab1e..2527da5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -33,7 +33,7 @@ if (SOLANACEAE_SDBOT_WEBUI_STANDALONE) endif() # external libs -add_subdirectory(./external) # before increasing warn levels, sad :( +add_subdirectory(./external EXCLUDE_FROM_ALL) # before increasing warn levels, sad :( if (SOLANACEAE_SDBOT_WEBUI_STANDALONE) set(CMAKE_CXX_EXTENSIONS OFF) diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt index 4d96766..7f73810 100644 --- a/external/CMakeLists.txt +++ b/external/CMakeLists.txt @@ -41,16 +41,6 @@ if ( endif() endif() -# TODO: move entt dep into solanaceae_contact -if (NOT TARGET EnTT::EnTT) - FetchContent_Declare(EnTT - GIT_REPOSITORY https://github.com/skypjack/entt.git - GIT_TAG v3.12.2 - EXCLUDE_FROM_ALL - ) - FetchContent_MakeAvailable(EnTT) -endif() - if (NOT TARGET solanaceae_util) FetchContent_Declare(solanaceae_util GIT_REPOSITORY https://github.com/Green-Sky/solanaceae_util.git diff --git a/external/happyhttp/CMakeLists.txt b/external/happyhttp/CMakeLists.txt index 525e88e..101e200 100644 --- a/external/happyhttp/CMakeLists.txt +++ b/external/happyhttp/CMakeLists.txt @@ -7,4 +7,7 @@ add_library(happyhttp STATIC target_include_directories(happyhttp PUBLIC .) target_compile_features(happyhttp PUBLIC cxx_std_11) +if(WIN32) + target_link_libraries(happyhttp iphlpapi ws2_32) +endif()