Merge topic 'fix-xcode4-test-failures'

0cf4fa5 Xcode4: Requires more quoting of single quote char
This commit is contained in:
David Cole 2011-09-01 15:12:31 -04:00 committed by CMake Topic Stage
commit 925af96eda

View File

@ -3467,7 +3467,14 @@ void cmGlobalXCodeGenerator::AppendFlag(std::string& flags,
{ {
if(*c == '\'') if(*c == '\'')
{ {
flags += "\\\\'"; if (this->XcodeVersion >= 40)
{
flags += "'\\\\''";
}
else
{
flags += "\\\\'";
}
} }
else if(*c == '\\') else if(*c == '\\')
{ {