diff options
| author | Brad King <brad.king@kitware.com> | 2010-09-21 14:42:50 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2010-09-21 14:42:50 (GMT) |
| commit | 5968785b2f32a50b2c957da4dc49b257913853ce (patch) | |
| tree | 5ff44319090df610e9d29e240e611821dd1cb3f8 /Source | |
| parent | b7539e3832f379fed27c5573aaf83a704a9943bf (diff) | |
| parent | a8ded5338bf44173fe33e0249ab14aa3d8e7540c (diff) | |
| download | CMake-5968785b2f32a50b2c957da4dc49b257913853ce.zip CMake-5968785b2f32a50b2c957da4dc49b257913853ce.tar.gz CMake-5968785b2f32a50b2c957da4dc49b257913853ce.tar.bz2 | |
Merge topic 'xcode-ARCHS-quoting'
a8ded53 Xcode: Quote string values containing '$' (#11244)
0790af3 Xcode: Avoid trailing space in ARCHS list (#11244)
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmGlobalXCodeGenerator.cxx | 4 | ||||
| -rw-r--r-- | Source/cmXCodeObject.cxx | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx index c63b403..4e9969d 100644 --- a/Source/cmGlobalXCodeGenerator.cxx +++ b/Source/cmGlobalXCodeGenerator.cxx @@ -2726,12 +2726,14 @@ void cmGlobalXCodeGenerator buildSettings->AddAttribute("SDKROOT", this->CreateString(sysroot)); std::string archString; + const char* sep = ""; for( std::vector<std::string>::iterator i = this->Architectures.begin(); i != this->Architectures.end(); ++i) { + archString += sep; archString += *i; - archString += " "; + sep = " "; } buildSettings->AddAttribute("ARCHS", this->CreateString(archString.c_str())); diff --git a/Source/cmXCodeObject.cxx b/Source/cmXCodeObject.cxx index 07c7b8c..5920470 100644 --- a/Source/cmXCodeObject.cxx +++ b/Source/cmXCodeObject.cxx @@ -236,7 +236,7 @@ void cmXCodeObject::PrintString(std::ostream& os) const // considered special by the Xcode project file parser. bool needQuote = (this->String.empty() || - this->String.find_first_of(" <>.+-=@") != this->String.npos); + this->String.find_first_of(" <>.+-=@$") != this->String.npos); const char* quote = needQuote? "\"" : ""; // Print the string, quoted and escaped as necessary. |