From cd401a2131a1f8bcfe5fa818b57dcd63e2de2dc8 Mon Sep 17 00:00:00 2001 From: tytan652 Date: Sat, 13 Jan 2024 10:50:08 +0100 Subject: [PATCH] UI: Remove obs-ui-support The remaining files are only used by the UI, so those are restored in the obs-studio target --- UI/cmake/ui-elements.cmake | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/UI/cmake/ui-elements.cmake b/UI/cmake/ui-elements.cmake index 7c66c6ecd..73144a77b 100644 --- a/UI/cmake/ui-elements.cmake +++ b/UI/cmake/ui-elements.cmake @@ -1,14 +1,3 @@ -add_library(obs-ui-support INTERFACE) -add_library(OBS::ui-support ALIAS obs-ui-support) - -target_sources(obs-ui-support INTERFACE # cmake-format: sortable - clickable-label.hpp horizontal-scroll-area.cpp horizontal-scroll-area.hpp) - -target_include_directories(obs-ui-support INTERFACE "${CMAKE_CURRENT_SOURCE_DIR}") -target_compile_options(obs-ui-support INTERFACE $<$:-Wno-error=enum-conversion>) - -target_link_libraries(obs-studio PRIVATE OBS::ui-support) - if(NOT TARGET OBS::properties-view) add_subdirectory("${CMAKE_SOURCE_DIR}/shared/properties-view" "${CMAKE_BINARY_DIR}/shared/properties-view") endif() @@ -42,10 +31,13 @@ target_sources( balance-slider.hpp basic-controls.cpp basic-controls.hpp + clickable-label.hpp context-bar-controls.cpp context-bar-controls.hpp focus-list.cpp focus-list.hpp + horizontal-scroll-area.cpp + horizontal-scroll-area.hpp hotkey-edit.cpp hotkey-edit.hpp item-widget-helpers.cpp