From 48534c1badcd2f63dee2ee0106a109b93604827c Mon Sep 17 00:00:00 2001
From: Nat Goodspeed <nat@lindenlab.com>
Date: Tue, 22 May 2018 12:00:20 -0400
Subject: [PATCH] SL-821: Add macOS rpath to Mac viewer executable for
BugsplatMac.
The BugsplatMac framework is stamped with @rpath/BugsplatMac.framework/etc.,
so that's the dependency stamped into our viewer executable. To support that
lookup, direct CMake to add an appropriate RPATH to the executable.
---
indra/newview/CMakeLists.txt | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt
index 7638a74bc1b..954d5ce9edb 100644
--- a/indra/newview/CMakeLists.txt
+++ b/indra/newview/CMakeLists.txt
@@ -1361,9 +1361,16 @@ if (DARWIN)
llappdelegate-objc.mm
PROPERTIES
COMPILE_DEFINITIONS "${VIEWER_CHANNEL_VERSION_DEFINES}"
+ # BugsplatMac is a module, imported with @import. That language feature
+ # demands these switches.
COMPILE_FLAGS "-fmodules -fcxx-modules"
)
+ # from https://stackoverflow.com/a/43551534
+ set(CMAKE_MACOSX_RPATH 1)
+ # From Contents/MacOS/SecondLife, look in Contents/Frameworks
+ set(CMAKE_INSTALL_RPATH "@loader_path/../Frameworks")
+
find_library(AGL_LIBRARY AGL)
find_library(APPKIT_LIBRARY AppKit)
find_library(COCOA_LIBRARY Cocoa)
--
GitLab