From bb85651d987a6cb969de7dd7c2b130411de6203c Mon Sep 17 00:00:00 2001
From: Nicky <nicky.dasmijn@gmail.com>
Date: Sat, 16 Apr 2022 15:29:02 +0200
Subject: Create a new target ll::oslibrary to link against libs specific to
the OS compiled on. This gets rid of the a few OS specific set and uses
variables (which some even seemed mostly duplicate like WINDOWS_LIBRARIES ans
UI_LIBRARIES) and it also solves the problem of having them to tack on every
target, as of no they come as a transitive dependency from llcommon
---
indra/newview/CMakeLists.txt | 16 ----------------
1 file changed, 16 deletions(-)
(limited to 'indra/newview')
diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt
index 2be83c9900..e039828221 100644
--- a/indra/newview/CMakeLists.txt
+++ b/indra/newview/CMakeLists.txt
@@ -1372,19 +1372,6 @@ if (DARWIN)
COMPILE_FLAGS "-fmodules -fcxx-modules -Wno-nullability-completeness"
)
- find_library(AGL_LIBRARY AGL)
- find_library(APPKIT_LIBRARY AppKit)
- find_library(COCOA_LIBRARY Cocoa)
- find_library(IOKIT_LIBRARY IOKit)
- find_library(COREAUDIO_LIBRARY CoreAudio)
-
- set(viewer_LIBRARIES
- ${COCOA_LIBRARY}
- ${AGL_LIBRARY}
- ${IOKIT_LIBRARY}
- ${COREAUDIO_LIBRARY}
- )
-
if (USE_BUGSPLAT)
list(APPEND viewer_LIBRARIES
bugsplat::bugsplat
@@ -1558,7 +1545,6 @@ if (WINDOWS)
# see EXP-1765 - theory is opengl32.lib needs to be included before gdi32.lib (windows libs)
set(viewer_LIBRARIES
opengl32
- ${WINDOWS_LIBRARIES}
comdlg32
dxguid
kernel32
@@ -1972,7 +1958,6 @@ target_link_libraries(${VIEWER_BINARY_NAME}
ll::ndof
${SMARTHEAP_LIBRARY}
${UI_LIBRARIES}
- ${WINDOWS_LIBRARIES}
lllogin
llprimitive
llappearance
@@ -2358,7 +2343,6 @@ if (LL_TESTS)
set(test_libs
- ${WINDOWS_LIBRARIES}
llfilesystem
llmath
llcommon
--
cgit v1.2.3