#4470 Adjustments and Mac build fixes

Author: akleshchev

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

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)
 

indra/newview/viewer_manifest.py

@@ -1022,7 +1022,7 @@ def path_optional(src, dst):
                     self.path2basename(relpkgdir, libfile)
 
                 # Discord social SDK
-                if self.args['DISCORD'] == 'ON':
+                if self.args['discord'] == 'ON':
                     for libfile in (
                                 "libdiscord_partner_sdk.dylib",
                                 ):