kolan/CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

BUG: Enabled use of EscapeForShell to properly escape custom command lines. This addresses bug#3786 for Xcode.

Browse Source
This commit is contained in:
Brad King 2006-09-21 16:10:47 -04:00
parent 6d72bb5ae1
commit b9fc06735d
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Source/cmGlobalXCodeGenerator.cxx
View File

@ -1037,7 +1037,8 @@ cmGlobalXCodeGenerator::AddCommandsToBuildPhase(cmXCodeObject* buildphase,
for(unsigned int j=1; j < commandLine.size(); ++j) for(unsigned int j=1; j < commandLine.size(); ++j)
{ {
cmd += " "; cmd += " ";
cmd += cmSystemTools::EscapeSpaces(commandLine[j].c_str()); cmd += (this->CurrentLocalGenerator
->EscapeForShell(commandLine[j].c_str()));
} }
makefileStream << "\t" << cmd.c_str() << "\n"; makefileStream << "\t" << cmd.c_str() << "\n";
} }

4
Source/cmLocalGenerator.h
View File

@ -201,12 +201,12 @@ public:
const char* LanguageCompileFlags; const char* LanguageCompileFlags;
}; };
protected:
/** Escape the given string to be used as a command line argument in /** Escape the given string to be used as a command line argument in
the native build system shell. */ the native build system shell. */
std::string EscapeForShell(const char* str); std::string EscapeForShell(const char* str);
protected:
/** Construct a comment for a custom command. */ /** Construct a comment for a custom command. */
std::string ConstructComment(const cmCustomCommand& cc, std::string ConstructComment(const cmCustomCommand& cc,
const char* default_comment = ""); const char* default_comment = "");