summaryrefslogtreecommitdiff
path: root/indra/llui
diff options
context:
space:
mode:
authorNicky <nicky.dasmijn@gmail.com>2022-04-16 15:29:02 +0200
committerNicky <nicky.dasmijn@gmail.com>2022-04-16 15:29:02 +0200
commitbb85651d987a6cb969de7dd7c2b130411de6203c (patch)
treed143b3b23331469170515726baa8a76af60135dd /indra/llui
parentc8eb53859fb9b9f59d5ce8ef67f4011e95e34a9a (diff)
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
Diffstat (limited to 'indra/llui')
-rw-r--r--indra/llui/CMakeLists.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llui/CMakeLists.txt b/indra/llui/CMakeLists.txt
index 9035095d5f..5e71b673a5 100644
--- a/indra/llui/CMakeLists.txt
+++ b/indra/llui/CMakeLists.txt
@@ -272,7 +272,7 @@ target_link_libraries(llui
# Add tests
if(LL_TESTS)
include(LLAddBuildTest)
- set(test_libs llmessage llcorehttp llxml llrender llcommon ll::hunspell ${WINDOWS_LIBRARIES})
+ set(test_libs llmessage llcorehttp llxml llrender llcommon ll::hunspell)
SET(llui_TEST_SOURCE_FILES
llurlmatch.cpp
@@ -282,7 +282,7 @@ if(LL_TESTS)
# INTEGRATION TESTS
if(NOT LINUX)
- set(test_libs llui llmessage llcorehttp llxml llrender llcommon ll::hunspell ${WINDOWS_LIBRARIES})
+ set(test_libs llui llmessage llcorehttp llxml llrender llcommon ll::hunspell )
LL_ADD_INTEGRATION_TEST(llurlentry llurlentry.cpp "${test_libs}")
endif(NOT LINUX)
endif(LL_TESTS)