From b247c4e42434715459df93b5cbf6adb15d3c4cc4 Mon Sep 17 00:00:00 2001
From: Nat Goodspeed <nat@lindenlab.com>
Date: Thu, 24 May 2018 08:48:00 -0400
Subject: [PATCH] SL-821: Force the Mac -rpath linker switch using LINK_FLAGS
property instead of the INSTALL_RPATH CMake property, which _should_ have
worked.
---
indra/newview/CMakeLists.txt | 3 +++
1 file changed, 3 insertions(+)
diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt
index 9e8a68224b2..c67f365767a 100644
--- a/indra/newview/CMakeLists.txt
+++ b/indra/newview/CMakeLists.txt
@@ -2106,6 +2106,9 @@ if (DARWIN)
OUTPUT_NAME "${product}"
# From Contents/MacOS/SecondLife, look in Contents/Frameworks
INSTALL_RPATH "@loader_path/../Frameworks"
+ # SIGH, as of 2018-05-24 (cmake 3.11.1) the INSTALL_RPATH property simply
+ # does not work. Try this:
+ LINK_FLAGS "-rpath @loader_path/../Frameworks"
MACOSX_BUNDLE_INFO_PLIST
"${CMAKE_CURRENT_SOURCE_DIR}/Info-SecondLife.plist"
)
--
GitLab