28 lines
930 B
Plaintext
28 lines
930 B
Plaintext
$OpenBSD: patch-Source_cmComputeLinkInformation_cxx,v 1.1 2010/05/28 20:21:48 dcoppa Exp $
|
|
--- Source/cmComputeLinkInformation.cxx.orig Tue Apr 6 16:45:33 2010
|
|
+++ Source/cmComputeLinkInformation.cxx Fri Apr 23 22:39:44 2010
|
|
@@ -376,6 +376,8 @@ cmComputeLinkInformation
|
|
{
|
|
this->OrderDependentRPath
|
|
->SetImplicitDirectories(this->ImplicitLinkDirs);
|
|
+ this->OrderDependentRPath
|
|
+ ->AddLanguageDirectories(this->RuntimeLinkDirs);
|
|
}
|
|
|
|
// Decide whether to enable compatible library search path mode.
|
|
@@ -1641,6 +1643,14 @@ void cmComputeLinkInformation::LoadImplicitLinkInfo()
|
|
{
|
|
this->ImplicitLinkLibs.insert(item);
|
|
}
|
|
+ }
|
|
+
|
|
+ // Get platform specific rpath link directories
|
|
+ if(const char *rpathDirs =
|
|
+ (this->Makefile->GetDefinition
|
|
+ ("CMAKE_PLATFORM_RUNTIME_PATH")))
|
|
+ {
|
|
+ cmSystemTools::ExpandListArgument(rpathDirs, this->RuntimeLinkDirs);
|
|
}
|
|
}
|
|
|