Merge commit 'a1d5101a678f' from apple/master into swift/master-next

git apple-llvm automerger · git apple-llvm automerger · commit 41bfea05b7b2 · 2019-11-11T19:23:10.000-08:00
diff --git a/lldb/cmake/modules/LLDBFramework.cmake b/lldb/cmake/modules/LLDBFramework.cmake
@@ -129,3 +129,8 @@ if(NOT IOS)
     )
   endif()
 endif()
+
+# Add an rpath pointing to the directory where LLDB.framework is installed.
+# This allows frameworks (relying on @rpath) to be installed in the same folder and found at runtime.
+set_property(TARGET liblldb APPEND PROPERTY INSTALL_RPATH
+  "@loader_path/../../../")

Original file line number	Diff line number	Diff line change
`@@ -129,3 +129,8 @@ if(NOT IOS)`
`129`	`129`	`)`
`130`	`130`	`endif()`
`131`	`131`	`endif()`
	`132`	`+`
	`133`	`+# Add an rpath pointing to the directory where LLDB.framework is installed.`
	`134`	`+# This allows frameworks (relying on @rpath) to be installed in the same folder and found at runtime.`
	`135`	`+set_property(TARGET liblldb APPEND PROPERTY INSTALL_RPATH`
	`136`	`+ "@loader_path/../../../")`