[Cmake-commits] CMake branch, next, updated. v2.8.11-2227-g3a94f2e

[Clinton Stimpson]

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  3a94f2eae9c71f9890f8013404d2c389e84a3bb2 (commit)
       via  78eeb70e4ce8505795eb9ef603c670b242a7b55a (commit)
      from  0d39e472c1f26711adb1d641bfa272080b3a611b (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=3a94f2eae9c71f9890f8013404d2c389e84a3bb2
commit 3a94f2eae9c71f9890f8013404d2c389e84a3bb2
Merge: 0d39e47 78eeb70
Author:     Clinton Stimpson <clinton at elemtech.com>
AuthorDate: Mon May 27 18:36:57 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon May 27 18:36:57 2013 -0400

    Merge topic 'xcode-shlib-versioning' into next
    
    78eeb70 Fix test failures with older Xcode from a060f29f.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=78eeb70e4ce8505795eb9ef603c670b242a7b55a
commit 78eeb70e4ce8505795eb9ef603c670b242a7b55a
Author:     Clinton Stimpson <clinton at elemtech.com>
AuthorDate: Mon May 27 16:34:58 2013 -0600
Commit:     Clinton Stimpson <clinton at elemtech.com>
CommitDate: Mon May 27 16:35:35 2013 -0600

    Fix test failures with older Xcode from a060f29f.
    
    It was complinaing about duplicate install names.

diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx
index 2e2d4c4..9bbf186 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -2224,7 +2224,6 @@ void cmGlobalXCodeGenerator::CreateBuildSettings(cmTarget& target,
     // of dylib libraries, we want to specify the install_name.
     // This is done by adding a link flag to create an install_name
     // with just the library soname.
-    extraLinkOptions += " -install_name ";
     std::string install_name;
     if(!install_name_dir.empty())
       {
@@ -2234,7 +2233,13 @@ void cmGlobalXCodeGenerator::CreateBuildSettings(cmTarget& target,
       install_name += "/";
       }
     install_name += target.GetSOName(configName);
-    extraLinkOptions += XCodeEscapePath(install_name.c_str());
+
+    if((realName != soName) || install_name_dir.empty())
+      {
+      install_name_dir = "";
+      extraLinkOptions += " -install_name ";
+      extraLinkOptions += XCodeEscapePath(install_name.c_str());
+      }
     }
   buildSettings->AddAttribute("INSTALL_PATH",
                               this->CreateString(install_name_dir.c_str()));

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

Summary of changes:
 Source/cmGlobalXCodeGenerator.cxx |    9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake