[Cmake-commits] CMake branch, next, updated. v2.8.5-1313-g117120b

[Brad King]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  117120b3208354440fe14b997faa5f708abf5cc8 (commit)
       via  317d077f6ed05640f86efbcb5c34d776a4ad9590 (commit)
      from  3a86ea655d51b861ce00309fecdcfcb02946ec83 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=117120b3208354440fe14b997faa5f708abf5cc8
commit 117120b3208354440fe14b997faa5f708abf5cc8
Merge: 3a86ea6 317d077
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Jul 27 09:44:20 2011 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Jul 27 09:44:20 2011 -0400

    Merge topic 'library-multiarch-issue-12326' into next
    
    317d077 multiarch: Treat lib/<arch> as implicit link dir (#12326)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=317d077f6ed05640f86efbcb5c34d776a4ad9590
commit 317d077f6ed05640f86efbcb5c34d776a4ad9590
Author:     Modestas Vainius <modax at debian.org>
AuthorDate: Mon Jul 25 13:24:41 2011 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Jul 27 09:13:58 2011 -0400

    multiarch: Treat lib/<arch> as implicit link dir (#12326)
    
    Add multiarch library directories to the set of implicit link
    directories.  In particular, this keeps lib/<arch> out of R(UN)PATH.

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;

-----------------------------------------------------------------------

Summary of changes:
 Source/cmComputeLinkInformation.cxx |   12 ++++++++++++
 1 files changed, 12 insertions(+), 0 deletions(-)


hooks/post-receive
-- 
CMake