diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2018-05-24 08:48:00 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2018-05-24 08:48:00 -0400 |
| commit | b247c4e42434715459df93b5cbf6adb15d3c4cc4 (patch) | |
| tree | c3aa31b9ea5fed1d7e73e68570569d012c45d76d /indra | |
| parent | c665a05b7863277e7da744f70421c37d8786c230 (diff) | |
SL-821: Force the Mac -rpath linker switch using LINK_FLAGS property
instead of the INSTALL_RPATH CMake property, which _should_ have worked.
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/CMakeLists.txt | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt index 9e8a68224b..c67f365767 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" ) |