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

BUG: fix for empty custom commands

Browse Source
This commit is contained in:
Andy Cedilnik 2005-05-20 12:09:33 -04:00
parent 60bcce7fa2
commit e86b9d33d0
1 changed files with 18 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
Source/cmLocalUnixMakefileGenerator3.cxx
View File

@ -2527,22 +2527,25 @@ cmLocalUnixMakefileGenerator3
// Build the command line in a single string. // Build the command line in a single string.
const cmCustomCommandLine& commandLine = *cl; const cmCustomCommandLine& commandLine = *cl;
std::string cmd = commandLine[0]; std::string cmd = commandLine[0];
cmSystemTools::ReplaceString(cmd, "/./", "/"); if (cmd.size())
cmd = this->Convert(cmd.c_str(),START_OUTPUT);
if(cmd.find("/") == cmd.npos &&
commandLine[0].find("/") != cmd.npos)
{ {
// Add a leading "./" for executables in the current directory. cmSystemTools::ReplaceString(cmd, "/./", "/");
cmd = "./" + cmd; cmd = this->Convert(cmd.c_str(),START_OUTPUT);
} if(cmd.find("/") == cmd.npos &&
cmd = this->Convert(cmd.c_str(),NONE,SHELL); commandLine[0].find("/") != cmd.npos)
for(unsigned int j=1; j < commandLine.size(); ++j) {
{ // Add a leading "./" for executables in the current directory.
cmd += " "; cmd = "./" + cmd;
cmd += cmSystemTools::EscapeSpaces(commandLine[j].c_str()); }
} cmd = this->Convert(cmd.c_str(),NONE,SHELL);
for(unsigned int j=1; j < commandLine.size(); ++j)
{
cmd += " ";
cmd += cmSystemTools::EscapeSpaces(commandLine[j].c_str());
}
commands1.push_back(cmd); commands1.push_back(cmd);
}
} }
// stick this group of commands into a cd of the proper path // stick this group of commands into a cd of the proper path