Merge topic 'fix-xcode4-test-failures'

0cf4fa5 Xcode4: Requires more quoting of single quote char
2026-01-05 21:31:08 -06:00 · 2011-09-01 15:12:31 -04:00
parent 319df3245e 0cf4fa578a
commit 925af96eda
1 changed files with 8 additions and 1 deletions
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -3467,7 +3467,14 @@ void cmGlobalXCodeGenerator::AppendFlag(std::string& flags,
    {
    if(*c == '\'')
      {
-      flags += "\\\\'";
+      if (this->XcodeVersion >= 40)
+        {
+        flags += "'\\\\''";
+        }
+      else
+        {
+        flags += "\\\\'";
+        }
      }
    else if(*c == '\\')
      {