summaryrefslogtreecommitdiffstats
path: root/Source/cmComputeLinkInformation.cxx
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2008-02-07 01:14:55 (GMT)
committerBrad King <brad.king@kitware.com>2008-02-07 01:14:55 (GMT)
commit96c55629c59e8711ec0f1383fe57fb5f3b43e5f4 (patch)
tree915b351cf6f9ba9bf12fb14b13ad867b3f3173f4 /Source/cmComputeLinkInformation.cxx
parent10dfc89731f1a4152d7a0e2c728affce0948a585 (diff)
downloadCMake-96c55629c59e8711ec0f1383fe57fb5f3b43e5f4.zip
CMake-96c55629c59e8711ec0f1383fe57fb5f3b43e5f4.tar.gz
CMake-96c55629c59e8711ec0f1383fe57fb5f3b43e5f4.tar.bz2
BUG: Fix cmComputeLinkInformation to include the target's user link directories in the runtime path computation. This bug was introduced when cmOrderRuntimeDirectories was introduced.
Diffstat (limited to 'Source/cmComputeLinkInformation.cxx')
-rw-r--r--Source/cmComputeLinkInformation.cxx5
1 files changed, 5 insertions, 0 deletions
diff --git a/Source/cmComputeLinkInformation.cxx b/Source/cmComputeLinkInformation.cxx
index a10155c..dea08bc 100644
--- a/Source/cmComputeLinkInformation.cxx
+++ b/Source/cmComputeLinkInformation.cxx
@@ -328,6 +328,11 @@ cmComputeLinkInformation
"dependent library path");
}
+ // Add the search path entries requested by the user to the runtime
+ // path computation.
+ this->OrderRuntimeSearchPath->AddDirectories(
+ this->Target->GetLinkDirectories());
+
// Get the implicit link directories for this platform.
if(const char* implicitLinks =
(this->Makefile->GetDefinition