diff options
| author | David Cole <david.cole@kitware.com> | 2011-08-02 19:09:45 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2011-08-02 19:09:45 (GMT) |
| commit | c6051b7abd093707ad3779a9a29cbf772355e8f5 (patch) | |
| tree | a6a569802b18063ecaee976ad1056a1bbf1a3eba /Source | |
| parent | 2c7b38afa6e941166501dfed47e6b22b1847b9ab (diff) | |
| parent | 317d077f6ed05640f86efbcb5c34d776a4ad9590 (diff) | |
| download | CMake-c6051b7abd093707ad3779a9a29cbf772355e8f5.zip CMake-c6051b7abd093707ad3779a9a29cbf772355e8f5.tar.gz CMake-c6051b7abd093707ad3779a9a29cbf772355e8f5.tar.bz2 | |
Merge topic 'library-multiarch-issue-12326'
317d077 multiarch: Treat lib/<arch> as implicit link dir (#12326)
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmComputeLinkInformation.cxx | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/Source/cmComputeLinkInformation.cxx b/Source/cmComputeLinkInformation.cxx index e3c33a2..c87b64d 100644 --- a/Source/cmComputeLinkInformation.cxx +++ b/Source/cmComputeLinkInformation.cxx @@ -1603,6 +1603,18 @@ void cmComputeLinkInformation::LoadImplicitLinkInfo() cmSystemTools::ExpandListArgument(implicitLinks, implicitDirVec); } + // Append library architecture to all implicit platform directories + // and add them to the set + if(const char* libraryArch = + this->Makefile->GetDefinition("CMAKE_LIBRARY_ARCHITECTURE")) + { + for (std::vector<std::string>::const_iterator i = implicitDirVec.begin(); + i != implicitDirVec.end(); ++i) + { + this->ImplicitLinkDirs.insert(*i + "/" + libraryArch); + } + } + // Get language-specific implicit directories. std::string implicitDirVar = "CMAKE_"; implicitDirVar += this->LinkLanguage; |