diff options
author | Brad King <brad.king@kitware.com> | 2008-01-31 12:50:40 (GMT) |
---|---|---|
committer | Brad King <brad.king@kitware.com> | 2008-01-31 12:50:40 (GMT) |
commit | 3a05425309dd19f4c91febdf96b4ac3fc1d17ce5 (patch) | |
tree | 4f14c27a2a15110486bb93ade1c50b17154ee977 /Source/cmComputeLinkInformation.h | |
parent | 73a5f0846f4946d74bbe7822fdf5458481e03362 (diff) | |
download | CMake-3a05425309dd19f4c91febdf96b4ac3fc1d17ce5.zip CMake-3a05425309dd19f4c91febdf96b4ac3fc1d17ce5.tar.gz CMake-3a05425309dd19f4c91febdf96b4ac3fc1d17ce5.tar.bz2 |
BUG: Move decision to switch library paths found in implicit link directories to use -l options from cmFindLibraryCommand to cmComputeLinkInformation. Existing projects may depend on find_library returning a full path. This slightly weakens cmComputeLinkInformation but is necessary for compatibility.
Diffstat (limited to 'Source/cmComputeLinkInformation.h')
-rw-r--r-- | Source/cmComputeLinkInformation.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Source/cmComputeLinkInformation.h b/Source/cmComputeLinkInformation.h index 33328c0..4ca3afa 100644 --- a/Source/cmComputeLinkInformation.h +++ b/Source/cmComputeLinkInformation.h @@ -117,6 +117,7 @@ private: // Handling of link items that are not targets or full file paths. void AddTargetItem(std::string const& item, cmTarget* target); void AddFullItem(std::string const& item); + bool CheckImplicitDirItem(std::string const& item); void AddUserItem(std::string const& item); void AddDirectoryItem(std::string const& item); void AddFrameworkItem(std::string const& item); @@ -132,6 +133,7 @@ private: void ComputeLinkerSearchDirectories(); void AddLinkerSearchDirectories(std::vector<std::string> const& dirs); std::set<cmStdString> DirectoriesEmmitted; + std::set<cmStdString> ImplicitLinkDirs; // Linker search path compatibility mode. std::vector<std::string> OldLinkDirs; |