From c26749750998c2efaa5208b83bc48d65dfa60274 Mon Sep 17 00:00:00 2001 From: Andrey Kleshchev Date: Tue, 5 Aug 2025 09:33:19 +0300 Subject: #4470 Adjustments and Mac build fixes --- indra/cmake/Copy3rdPartyLibs.cmake | 4 +++- indra/cmake/Discord.cmake | 2 ++ 2 files changed, 5 insertions(+), 1 deletion(-) (limited to 'indra/cmake') diff --git a/indra/cmake/Copy3rdPartyLibs.cmake b/indra/cmake/Copy3rdPartyLibs.cmake index de41918a34..0153e69d5b 100644 --- a/indra/cmake/Copy3rdPartyLibs.cmake +++ b/indra/cmake/Copy3rdPartyLibs.cmake @@ -6,7 +6,9 @@ include(CMakeCopyIfDifferent) include(Linking) -include(Discord) +if (USE_DISCORD) + include(Discord) +endif () include(OPENAL) # When we copy our dependent libraries, we almost always want to copy them to diff --git a/indra/cmake/Discord.cmake b/indra/cmake/Discord.cmake index d15b4041b1..95cfaacf5b 100644 --- a/indra/cmake/Discord.cmake +++ b/indra/cmake/Discord.cmake @@ -1,5 +1,7 @@ include(Prebuilt) +include_guard() + add_library(ll::discord_sdk INTERFACE IMPORTED) target_compile_definitions(ll::discord_sdk INTERFACE LL_DISCORD=1) -- cgit v1.2.3