diff options
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmLocalUnixMakefileGenerator.cxx | 4 | ||||
| -rw-r--r-- | Source/cmSystemTools.cxx | 9 |
2 files changed, 8 insertions, 5 deletions
diff --git a/Source/cmLocalUnixMakefileGenerator.cxx b/Source/cmLocalUnixMakefileGenerator.cxx index 80fee93..f00261c 100644 --- a/Source/cmLocalUnixMakefileGenerator.cxx +++ b/Source/cmLocalUnixMakefileGenerator.cxx @@ -2587,7 +2587,7 @@ void cmLocalUnixMakefileGenerator::OutputMakeRule(std::ostream& fout, tgt = this->ConvertToMakeTarget(tgt.c_str()); if(depends.empty()) { - fout << tgt.c_str() << ":\n"; + fout << tgt.c_str() << " :\n"; } else { @@ -2599,7 +2599,7 @@ void cmLocalUnixMakefileGenerator::OutputMakeRule(std::ostream& fout, replace = *dep; m_Makefile->ExpandVariablesInString(replace); replace = this->ConvertToMakeTarget(replace.c_str()); - fout << tgt.c_str() << ": " << replace.c_str() << "\n"; + fout << tgt.c_str() << " : " << replace.c_str() << "\n"; } } diff --git a/Source/cmSystemTools.cxx b/Source/cmSystemTools.cxx index 26ebdca..18d9c28 100644 --- a/Source/cmSystemTools.cxx +++ b/Source/cmSystemTools.cxx @@ -426,15 +426,18 @@ bool cmSystemTools::RunSingleCommand( { verbose = false; } + std::string argsTemp; + std::string program; + cmSystemTools::SplitProgramFromArgs(command, program, argsTemp); + std::vector<cmStdString> args = cmSystemTools::ParseArguments(argsTemp.c_str()); - std::vector<cmStdString> args = cmSystemTools::ParseArguments(command); - - if(args.size() < 1) + if(program.size() < 1) { return false; } std::vector<const char*> argv; + argv.push_back(program.c_str()); for(std::vector<cmStdString>::const_iterator a = args.begin(); a != args.end(); ++a) { |