diff options
| author | David Cole <david.cole@kitware.com> | 2011-09-01 19:12:31 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2011-09-01 19:12:31 (GMT) |
| commit | 925af96eda392cff31e57c832ab5ed17e0e3805f (patch) | |
| tree | 63a548d7551259dd2fe7314c7279b7149ce8a6c8 /Source/cmGlobalXCodeGenerator.cxx | |
| parent | 319df3245e774d807b993ff2fff3957e219ffe7b (diff) | |
| parent | 0cf4fa578a62dc411e69c59aaaea2a0cf339d24b (diff) | |
| download | CMake-925af96eda392cff31e57c832ab5ed17e0e3805f.zip CMake-925af96eda392cff31e57c832ab5ed17e0e3805f.tar.gz CMake-925af96eda392cff31e57c832ab5ed17e0e3805f.tar.bz2 | |
Merge topic 'fix-xcode4-test-failures'
0cf4fa5 Xcode4: Requires more quoting of single quote char
Diffstat (limited to 'Source/cmGlobalXCodeGenerator.cxx')
| -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 f67b029..02a95fe 100644 --- 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 == '\\') { |