From 51c17032be8976e7da2620b11f51aaf816dc9ec5 Mon Sep 17 00:00:00 2001 From: tytan652 Date: Wed, 2 Aug 2023 10:59:54 +0200 Subject: [PATCH] deps,shared,obs-outputs: Move happy-eyeballs to shared folder --- deps/CMakeLists.txt | 1 - plugins/obs-outputs/CMakeLists.txt | 2 +- plugins/obs-outputs/cmake/legacy.cmake | 4 ++++ {deps => shared}/happy-eyeballs/CMakeLists.txt | 0 {deps => shared}/happy-eyeballs/happy-eyeballs.c | 0 {deps => shared}/happy-eyeballs/happy-eyeballs.h | 0 6 files changed, 5 insertions(+), 2 deletions(-) rename {deps => shared}/happy-eyeballs/CMakeLists.txt (100%) rename {deps => shared}/happy-eyeballs/happy-eyeballs.c (100%) rename {deps => shared}/happy-eyeballs/happy-eyeballs.h (100%) diff --git a/deps/CMakeLists.txt b/deps/CMakeLists.txt index 7f065ec02..635b6a847 100644 --- a/deps/CMakeLists.txt +++ b/deps/CMakeLists.txt @@ -5,7 +5,6 @@ endif() add_subdirectory(blake2) add_subdirectory(glad) -add_subdirectory(happy-eyeballs) add_subdirectory(libcaption) add_subdirectory(media-playback) add_subdirectory(obs-scripting) diff --git a/plugins/obs-outputs/CMakeLists.txt b/plugins/obs-outputs/CMakeLists.txt index 576911a0c..d0b7c4ba3 100644 --- a/plugins/obs-outputs/CMakeLists.txt +++ b/plugins/obs-outputs/CMakeLists.txt @@ -6,7 +6,7 @@ find_package(MbedTLS REQUIRED) find_package(ZLIB REQUIRED) if(NOT TARGET happy-eyeballs) - add_subdirectory("${CMAKE_SOURCE_DIR}/deps/happy-eyeballs" "${CMAKE_BINARY_DIR}/deps/happy-eyeballs") + add_subdirectory("${CMAKE_SOURCE_DIR}/shared/happy-eyeballs" "${CMAKE_BINARY_DIR}/shared/happy-eyeballs") endif() add_library(obs-outputs MODULE) diff --git a/plugins/obs-outputs/cmake/legacy.cmake b/plugins/obs-outputs/cmake/legacy.cmake index 12b474a1e..e8f14b1a3 100644 --- a/plugins/obs-outputs/cmake/legacy.cmake +++ b/plugins/obs-outputs/cmake/legacy.cmake @@ -13,6 +13,10 @@ mark_as_advanced(ENABLE_STATIC_MBEDTLS) add_library(obs-outputs MODULE) add_library(OBS::outputs ALIAS obs-outputs) +if(NOT TARGET happy-eyeballs) + add_subdirectory("${CMAKE_SOURCE_DIR}/shared/happy-eyeballs" "${CMAKE_BINARY_DIR}/shared/happy-eyeballs") +endif() + target_sources( obs-outputs PRIVATE obs-outputs.c diff --git a/deps/happy-eyeballs/CMakeLists.txt b/shared/happy-eyeballs/CMakeLists.txt similarity index 100% rename from deps/happy-eyeballs/CMakeLists.txt rename to shared/happy-eyeballs/CMakeLists.txt diff --git a/deps/happy-eyeballs/happy-eyeballs.c b/shared/happy-eyeballs/happy-eyeballs.c similarity index 100% rename from deps/happy-eyeballs/happy-eyeballs.c rename to shared/happy-eyeballs/happy-eyeballs.c diff --git a/deps/happy-eyeballs/happy-eyeballs.h b/shared/happy-eyeballs/happy-eyeballs.h similarity index 100% rename from deps/happy-eyeballs/happy-eyeballs.h rename to shared/happy-eyeballs/happy-eyeballs.h