From c66f444d2b3af7c5ea5220db5302b693bbc54f54 Mon Sep 17 00:00:00 2001
From: Nicky <nicky.dasmijn@posteo.nl>
Date: Mon, 20 Jun 2022 23:29:57 +0200
Subject: [PATCH] Cleanup dependency on ui libraries.
---
indra/llwindow/CMakeLists.txt | 7 ++-----
indra/newview/CMakeLists.txt | 1 -
2 files changed, 2 insertions(+), 6 deletions(-)
diff --git a/indra/llwindow/CMakeLists.txt b/indra/llwindow/CMakeLists.txt
index d09e5387b92..cc60625683b 100644
--- a/indra/llwindow/CMakeLists.txt
+++ b/indra/llwindow/CMakeLists.txt
@@ -56,15 +56,12 @@ set(llwindow_LINK_LIBRARIES
llxml
ll::glh_linear
ll::glext
+ ll::uilibraries
+ ll::SDL
)
# Libraries on which this library depends, needed for Linux builds
# Sort by high-level to low-level
if (LINUX)
- list( APPEND llwindow_LINK_LIBRARIES
- ll::uilibraries
- ll::SDL
- )
-
list(APPEND viewer_SOURCE_FILES
llkeyboardsdl.cpp
llwindowsdl.cpp
diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt
index d392e43dc64..a7cbf43d35f 100644
--- a/indra/newview/CMakeLists.txt
+++ b/indra/newview/CMakeLists.txt
@@ -1886,7 +1886,6 @@ target_link_libraries(${VIEWER_BINARY_NAME}
llcommon
llmeshoptimizer
ll::ndof
- ll::uilibraries
lllogin
llprimitive
llappearance
--
GitLab