diff options
| author | David Cole <david.cole@kitware.com> | 2011-08-25 22:35:54 (GMT) |
|---|---|---|
| committer | David Cole <david.cole@kitware.com> | 2011-08-25 22:39:21 (GMT) |
| commit | 0cf4fa578a62dc411e69c59aaaea2a0cf339d24b (patch) | |
| tree | f981342e36e6f0f01f31450ae879262999d8896e /Source | |
| parent | ee45a5dd5a1c10e98de4623ba0c17f79ccfcd3d8 (diff) | |
| download | CMake-0cf4fa578a62dc411e69c59aaaea2a0cf339d24b.zip CMake-0cf4fa578a62dc411e69c59aaaea2a0cf339d24b.tar.gz CMake-0cf4fa578a62dc411e69c59aaaea2a0cf339d24b.tar.bz2 | |
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.
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmGlobalXCodeGenerator.cxx | 9 |
1 files changed, 8 insertions, 1 deletions
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 == '\\') { |