From ed801e715f05adf06938c1a2f1f53e3319a81a54 Mon Sep 17 00:00:00 2001
From: Rye Mutt <rye@alchemyviewer.org>
Date: Fri, 16 Dec 2022 23:40:15 -0500
Subject: [PATCH] Attempt to fix CI build
---
indra/cmake/Copy3rdPartyLibs.cmake | 5 ++++-
indra/newview/CMakeLists.txt | 12 ++++++------
2 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/indra/cmake/Copy3rdPartyLibs.cmake b/indra/cmake/Copy3rdPartyLibs.cmake
index 5fc563a276b..ea7052ea87a 100644
--- a/indra/cmake/Copy3rdPartyLibs.cmake
+++ b/indra/cmake/Copy3rdPartyLibs.cmake
@@ -6,6 +6,9 @@
include(CMakeCopyIfDifferent)
include(Linking)
+include(DiscordSDK)
+include(FMODSTUDIO)
+include(Sentry)
# When we copy our dependent libraries, we almost always want to copy them to
# both the Release and the RelWithDebInfo staging directories. This has
@@ -98,7 +101,7 @@ if(WINDOWS)
# Filenames are different for 32/64 bit BugSplat file and we don't
# have any control over them so need to branch.
if (USE_SENTRY)
- set(release_files ${release_files} sentry.dll)
+ list(APPEND release_files sentry.dll)
endif ()
if (USE_FMODSTUDIO)
diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt
index 6f3878d93ec..8ccfb9a5853 100644
--- a/indra/newview/CMakeLists.txt
+++ b/indra/newview/CMakeLists.txt
@@ -2048,7 +2048,7 @@ if (WINDOWS)
--arch=${ARCH}
--artwork=${ARTWORK_DIR}
"--discord=${USE_DISCORD}"
- "--sentry=${SENTRY_DSN}"
+ "--sentry=${USE_SENTRY}"
"--fmodstudio=${USE_FMODSTUDIO}"
"--openal=${USE_OPENAL}"
"--kdu=${USE_KDU}"
@@ -2110,7 +2110,7 @@ if (WINDOWS)
--arch=${ARCH}
--artwork=${ARTWORK_DIR}
"--discord=${USE_DISCORD}"
- "--sentry=${SENTRY_DSN}"
+ "--sentry=${USE_SENTRY}"
"--fmodstudio=${USE_FMODSTUDIO}"
"--openal=${USE_OPENAL}"
"--kdu=${USE_KDU}"
@@ -2280,7 +2280,7 @@ if (LINUX)
--arch=${ARCH}
--artwork=${ARTWORK_DIR}
"--discord=${USE_DISCORD}"
- "--sentry=${SENTRY_DSN}"
+ "--sentry=${USE_SENTRY}"
"--fmodstudio=${USE_FMODSTUDIO}"
"--openal=${USE_OPENAL}"
"--kdu=${USE_KDU}"
@@ -2308,7 +2308,7 @@ if (LINUX)
--arch=${ARCH}
--artwork=${ARTWORK_DIR}
"--discord=${USE_DISCORD}"
- "--sentry=${SENTRY_DSN}"
+ "--sentry=${USE_SENTRY}"
"--fmodstudio=${USE_FMODSTUDIO}"
"--openal=${USE_OPENAL}"
"--kdu=${USE_KDU}"
@@ -2403,7 +2403,7 @@ if (DARWIN)
--arch=${ARCH}
--artwork=${ARTWORK_DIR}
"--discord=${USE_DISCORD}"
- "--sentry=${SENTRY_DSN}"
+ "--sentry=${USE_SENTRY}"
"--fmodstudio=${USE_FMODSTUDIO}"
"--openal=${USE_OPENAL}"
"--kdu=${USE_KDU}"
@@ -2448,7 +2448,7 @@ if (DARWIN)
--arch=${ARCH}
--artwork=${ARTWORK_DIR}
"--discord=${USE_DISCORD}"
- "--sentry=${SENTRY_DSN}"
+ "--sentry=${USE_SENTRY}"
"--fmodstudio=${USE_FMODSTUDIO}"
"--openal=${USE_OPENAL}"
"--kdu=${USE_KDU}"
--
GitLab