Merge topic 'fix-xcode4-test-failures'

0cf4fa5 Xcode4: Requires more quoting of single quote char

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 == '\\')
       {