Merge topic 'fix-xcode4-test-failures'
0cf4fa5 Xcode4: Requires more quoting of single quote char
This commit is contained in:
commit
925af96eda
@ -3466,9 +3466,16 @@ void cmGlobalXCodeGenerator::AppendFlag(std::string& flags,
|
|||||||
for(const char* c = flag.c_str(); *c; ++c)
|
for(const char* c = flag.c_str(); *c; ++c)
|
||||||
{
|
{
|
||||||
if(*c == '\'')
|
if(*c == '\'')
|
||||||
|
{
|
||||||
|
if (this->XcodeVersion >= 40)
|
||||||
|
{
|
||||||
|
flags += "'\\\\''";
|
||||||
|
}
|
||||||
|
else
|
||||||
{
|
{
|
||||||
flags += "\\\\'";
|
flags += "\\\\'";
|
||||||
}
|
}
|
||||||
|
}
|
||||||
else if(*c == '\\')
|
else if(*c == '\\')
|
||||||
{
|
{
|
||||||
flags += "\\\\\\\\";
|
flags += "\\\\\\\\";
|
||||||
|
Loading…
x
Reference in New Issue
Block a user