[Cmake-commits] CMake branch, next, updated. v2.8.5-1732-g43f0bb9

[David Cole]

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  43f0bb944a86bc665d25595fb4fc6fecf5cbaca7 (commit)
       via  0cf4fa578a62dc411e69c59aaaea2a0cf339d24b (commit)
      from  30098af31a2b094c1cf86ed698a7c111ce93abec (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=43f0bb944a86bc665d25595fb4fc6fecf5cbaca7
commit 43f0bb944a86bc665d25595fb4fc6fecf5cbaca7
Merge: 30098af 0cf4fa5
Author:     David Cole <david.cole at kitware.com>
AuthorDate: Thu Aug 25 18:49:26 2011 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Aug 25 18:49:26 2011 -0400

    Merge topic 'fix-xcode4-test-failures' into next
    
    0cf4fa5 Xcode4: Requires more quoting of single quote char


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0cf4fa578a62dc411e69c59aaaea2a0cf339d24b
commit 0cf4fa578a62dc411e69c59aaaea2a0cf339d24b
Author:     David Cole <david.cole at kitware.com>
AuthorDate: Thu Aug 25 18:35:54 2011 -0400
Commit:     David Cole <david.cole at kitware.com>
CommitDate: Thu Aug 25 18:39:21 2011 -0400

    Xcode4: Requires more quoting of single quote char
    
    Specifically in per-target and per-file compiler definition
    string values.
    
    The Preprocessor test now passes on Xcode 4 builds after
    this commit.

diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx
index fd9dacd..5f5c1c3 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -3409,7 +3409,14 @@ void cmGlobalXCodeGenerator::AppendFlag(std::string& flags,
     {
     if(*c == '\'')
       {
-      flags += "\\\\'";
+      if (this->XcodeVersion >= 40)
+        {
+        flags += "'\\\\''";
+        }
+      else
+        {
+        flags += "\\\\'";
+        }
       }
     else if(*c == '\\')
       {

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

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


hooks/post-receive
-- 
CMake