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

BUG: Avoid leading and trailing newlines in custom command scripts because some VS6 versions do not like the trailing backslash this produces. This addresses bug#3977.

This commit is contained in:
Brad King 2006-10-25 12:27:17 -04:00
parent 9b8f479e01
commit e23b82c2cf
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Source/cmLocalVisualStudioGenerator.cxx
View File

@ -113,15 +113,19 @@ cmLocalVisualStudioGenerator
const char* workingDirectory, const char* workingDirectory,
bool escapeOldStyle, bool escapeOldStyle,
bool escapeAllowMakeVars, bool escapeAllowMakeVars,
const char* newline) const char* newline_text)
{ {
// Avoid leading or trailing newlines.
const char* newline = "";
// Store the script in a string. // Store the script in a string.
std::string script; std::string script;
if(workingDirectory) if(workingDirectory)
{ {
script += newline;
newline = newline_text;
script += "cd "; script += "cd ";
script += this->Convert(workingDirectory, START_OUTPUT, SHELL); script += this->Convert(workingDirectory, START_OUTPUT, SHELL);
script += newline;
} }
// for visual studio IDE add extra stuff to the PATH // for visual studio IDE add extra stuff to the PATH
// if CMAKE_MSVCIDE_RUN_PATH is set. // if CMAKE_MSVCIDE_RUN_PATH is set.
@ -131,16 +135,21 @@ cmLocalVisualStudioGenerator
this->Makefile->GetDefinition("CMAKE_MSVCIDE_RUN_PATH"); this->Makefile->GetDefinition("CMAKE_MSVCIDE_RUN_PATH");
if(extraPath) if(extraPath)
{ {
script += newline;
newline = newline_text;
script += "set PATH="; script += "set PATH=";
script += extraPath; script += extraPath;
script += ";%PATH%"; script += ";%PATH%";
script += newline;
} }
} }
// Write each command on a single line. // Write each command on a single line.
for(cmCustomCommandLines::const_iterator cl = commandLines.begin(); for(cmCustomCommandLines::const_iterator cl = commandLines.begin();
cl != commandLines.end(); ++cl) cl != commandLines.end(); ++cl)
{ {
// Start a new line.
script += newline;
newline = newline_text;
// Start with the command name. // Start with the command name.
const cmCustomCommandLine& commandLine = *cl; const cmCustomCommandLine& commandLine = *cl;
script += this->Convert(commandLine[0].c_str(),START_OUTPUT,SHELL); script += this->Convert(commandLine[0].c_str(),START_OUTPUT,SHELL);
@ -159,9 +168,6 @@ cmLocalVisualStudioGenerator
escapeAllowMakeVars); escapeAllowMakeVars);
} }
} }
// End the line.
script += newline;
} }
return script; return script;
} }