diff options
| author | Bill Hoffman <bill.hoffman@kitware.com> | 2007-02-21 19:01:19 (GMT) |
|---|---|---|
| committer | Bill Hoffman <bill.hoffman@kitware.com> | 2007-02-21 19:01:19 (GMT) |
| commit | 7a13c7affe6ecdfda9ef4df1d5f9c7d039e922e0 (patch) | |
| tree | c9d362ebe03669c3d40420f3e104b17415cfaa71 /Source | |
| parent | 53c72ed6c3712c78f6c68e4e0093ac326577609a (diff) | |
| download | CMake-7a13c7affe6ecdfda9ef4df1d5f9c7d039e922e0.zip CMake-7a13c7affe6ecdfda9ef4df1d5f9c7d039e922e0.tar.gz CMake-7a13c7affe6ecdfda9ef4df1d5f9c7d039e922e0.tar.bz2 | |
BUG: fix for quotes in strings for flags #4022
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmGlobalXCodeGenerator.cxx | 6 | ||||
| -rw-r--r-- | Source/cmXCodeObject.cxx | 4 |
2 files changed, 6 insertions, 4 deletions
diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx index a9f0045..e87fb22 100644 --- a/Source/cmGlobalXCodeGenerator.cxx +++ b/Source/cmGlobalXCodeGenerator.cxx @@ -1156,7 +1156,7 @@ void cmGlobalXCodeGenerator::CreateBuildSettings(cmTarget& target, { buildSettings->AddAttribute ("GCC_PREPROCESSOR_DEFINITIONS", - this->CreateString("CMAKE_INTDIR=\\\\\\\"$(CONFIGURATION)\\\\\\\"")); + this->CreateString("CMAKE_INTDIR=\\\\\"$(CONFIGURATION)\\\\\"")); } std::string extraLinkOptions; if(target.GetType() == cmTarget::EXECUTABLE) @@ -2565,9 +2565,9 @@ std::string cmGlobalXCodeGenerator::XCodeEscapePath(const char* p) if(ret.find(' ') != ret.npos) { std::string t = ret; - ret = "\\\""; + ret = "\""; ret += t; - ret += "\\\""; + ret += "\""; } return ret; } diff --git a/Source/cmXCodeObject.cxx b/Source/cmXCodeObject.cxx index 37d51a5..de06025 100644 --- a/Source/cmXCodeObject.cxx +++ b/Source/cmXCodeObject.cxx @@ -190,6 +190,8 @@ void cmXCodeObject::SetString(const char* s) this->String = "\"\""; return; } + // escape quotes + cmSystemTools::ReplaceString(ss, "\"", "\\\""); bool needQuote = false; this->String = ""; if(ss.find_first_of(" <>.+-=") != ss.npos) @@ -200,7 +202,7 @@ void cmXCodeObject::SetString(const char* s) { this->String = "\""; } - this->String += s; + this->String += ss; if(needQuote) { this->String += "\""; |