[Cmake-commits] CMake branch, next, updated. v2.8.11-2223-g6ff21a8

[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  6ff21a80304dd8f82ab84f23bb170be7eb812e60 (commit)
       via  2ccdfd4f58469cfc75979f0e4abf31d411d60c39 (commit)
      from  82bebd2a8949fc59b1bb9f2f4c1e79f7d2807f5d (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=6ff21a80304dd8f82ab84f23bb170be7eb812e60
commit 6ff21a80304dd8f82ab84f23bb170be7eb812e60
Merge: 82bebd2 2ccdfd4
Author:     Clinton Stimpson <clinton at elemtech.com>
AuthorDate: Mon May 27 13:15:48 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon May 27 13:15:48 2013 -0400

    Merge topic 'xcode-shlib-versioning' into next
    
    2ccdfd4 Fix test failures from 7d8a0788 with spaces in paths.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2ccdfd4f58469cfc75979f0e4abf31d411d60c39
commit 2ccdfd4f58469cfc75979f0e4abf31d411d60c39
Author:     Clinton Stimpson <clinton at elemtech.com>
AuthorDate: Mon May 27 11:11:33 2013 -0600
Commit:     Clinton Stimpson <clinton at elemtech.com>
CommitDate: Mon May 27 11:14:41 2013 -0600

    Fix test failures from 7d8a0788 with spaces in paths.

diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx
index 43d49da..2e2d4c4 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -2225,15 +2225,16 @@ void cmGlobalXCodeGenerator::CreateBuildSettings(cmTarget& target,
     // 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())
       {
       // Convert to a path for the native build tool.
       cmSystemTools::ConvertToUnixSlashes(install_name_dir);
-      // do not escape spaces on this since it is only a single path
-      extraLinkOptions += install_name_dir;
-      extraLinkOptions += "/";
+      install_name += install_name_dir;
+      install_name += "/";
       }
-    extraLinkOptions += target.GetSOName(configName);
+    install_name += target.GetSOName(configName);
+    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, 5 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
CMake