diff options
| author | Brad King <brad.king@kitware.com> | 2006-04-04 18:25:17 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2006-04-04 18:25:17 (GMT) |
| commit | 57a9e26c151f429bc41dd90e86bc50ada9600bd1 (patch) | |
| tree | 85d6261d26a455c99ecb59a518058d26d0481081 /Tests | |
| parent | e45ef47bb8081ddc20f3f1997f253184e4adfcc8 (diff) | |
| download | CMake-57a9e26c151f429bc41dd90e86bc50ada9600bd1.zip CMake-57a9e26c151f429bc41dd90e86bc50ada9600bd1.tar.gz CMake-57a9e26c151f429bc41dd90e86bc50ada9600bd1.tar.bz2 | |
BUG: Fixed cmOrderLinkDirectories to make sure cmake-built libraries are found properly. Also taking libraries that will be built but may not yet exist into account. The per-configuration subdirectories that are included by generators in the link path are checked for conflicting libraries also. Potentially conflicting libraries that are actually symlinks back to the desired library are no longer considered conflicting, which avoids bogus impossible ordering warnings.
Diffstat (limited to 'Tests')
| -rw-r--r-- | Tests/Complex/Executable/complex.cxx | 4 | ||||
| -rw-r--r-- | Tests/ComplexOneConfig/Executable/complex.cxx | 4 | ||||
| -rw-r--r-- | Tests/ComplexRelativePaths/Executable/complex.cxx | 4 |
3 files changed, 9 insertions, 3 deletions
diff --git a/Tests/Complex/Executable/complex.cxx b/Tests/Complex/Executable/complex.cxx index 5b8cebd..1f4c21a 100644 --- a/Tests/Complex/Executable/complex.cxx +++ b/Tests/Complex/Executable/complex.cxx @@ -91,7 +91,9 @@ bool TestLibraryOrder(bool shouldFail) orderLibs.AddLinkExtension(".so"); orderLibs.AddLinkExtension(".a"); orderLibs.SetLinkPrefix("lib"); - orderLibs.SetLinkInformation("test", linkLibraries, linkDirectories); + cmTargetManifest manifest; + orderLibs.SetLinkInformation("test", linkLibraries, linkDirectories, + manifest, ""); bool ret = orderLibs.DetermineLibraryPathOrder(); if(!ret) { diff --git a/Tests/ComplexOneConfig/Executable/complex.cxx b/Tests/ComplexOneConfig/Executable/complex.cxx index 5b8cebd..1f4c21a 100644 --- a/Tests/ComplexOneConfig/Executable/complex.cxx +++ b/Tests/ComplexOneConfig/Executable/complex.cxx @@ -91,7 +91,9 @@ bool TestLibraryOrder(bool shouldFail) orderLibs.AddLinkExtension(".so"); orderLibs.AddLinkExtension(".a"); orderLibs.SetLinkPrefix("lib"); - orderLibs.SetLinkInformation("test", linkLibraries, linkDirectories); + cmTargetManifest manifest; + orderLibs.SetLinkInformation("test", linkLibraries, linkDirectories, + manifest, ""); bool ret = orderLibs.DetermineLibraryPathOrder(); if(!ret) { diff --git a/Tests/ComplexRelativePaths/Executable/complex.cxx b/Tests/ComplexRelativePaths/Executable/complex.cxx index 5b8cebd..1f4c21a 100644 --- a/Tests/ComplexRelativePaths/Executable/complex.cxx +++ b/Tests/ComplexRelativePaths/Executable/complex.cxx @@ -91,7 +91,9 @@ bool TestLibraryOrder(bool shouldFail) orderLibs.AddLinkExtension(".so"); orderLibs.AddLinkExtension(".a"); orderLibs.SetLinkPrefix("lib"); - orderLibs.SetLinkInformation("test", linkLibraries, linkDirectories); + cmTargetManifest manifest; + orderLibs.SetLinkInformation("test", linkLibraries, linkDirectories, + manifest, ""); bool ret = orderLibs.DetermineLibraryPathOrder(); if(!ret) { |