Commit e7c89567 authored by Stephen Kelly's avatar Stephen Kelly
Browse files

Convert: Inline uses of HOME_OUTPUT

parent dc510919
...@@ -428,14 +428,18 @@ bool cmDependsFortran::WriteDependenciesReal(const char* obj, ...@@ -428,14 +428,18 @@ bool cmDependsFortran::WriteDependenciesReal(const char* obj,
std::string modFile = mod_dir; std::string modFile = mod_dir;
modFile += "/"; modFile += "/";
modFile += *i; modFile += *i;
modFile = this->LocalGenerator->Convert( modFile = this->LocalGenerator->ConvertToOutputFormat(
modFile, cmOutputConverter::HOME_OUTPUT, cmOutputConverter::SHELL); this->LocalGenerator->ConvertToRelativePath(
this->LocalGenerator->GetBinaryDirectory(), modFile),
cmOutputConverter::SHELL);
std::string stampFile = stamp_dir; std::string stampFile = stamp_dir;
stampFile += "/"; stampFile += "/";
stampFile += m; stampFile += m;
stampFile += ".mod.stamp"; stampFile += ".mod.stamp";
stampFile = this->LocalGenerator->Convert( stampFile = this->LocalGenerator->ConvertToOutputFormat(
stampFile, cmOutputConverter::HOME_OUTPUT, cmOutputConverter::SHELL); this->LocalGenerator->ConvertToRelativePath(
this->LocalGenerator->GetBinaryDirectory(), stampFile),
cmOutputConverter::SHELL);
makeDepends << "\t$(CMAKE_COMMAND) -E cmake_copy_f90_mod " << modFile makeDepends << "\t$(CMAKE_COMMAND) -E cmake_copy_f90_mod " << modFile
<< " " << stampFile; << " " << stampFile;
cmMakefile* mf = this->LocalGenerator->GetMakefile(); cmMakefile* mf = this->LocalGenerator->GetMakefile();
......
...@@ -145,7 +145,8 @@ std::string cmLocalNinjaGenerator::ConvertToIncludeReference( ...@@ -145,7 +145,8 @@ std::string cmLocalNinjaGenerator::ConvertToIncludeReference(
return this->ConvertToOutputFormat(cmSystemTools::CollapseFullPath(path), return this->ConvertToOutputFormat(cmSystemTools::CollapseFullPath(path),
format); format);
} }
return this->Convert(path, cmOutputConverter::HOME_OUTPUT, format); return this->ConvertToOutputFormat(
this->ConvertToRelativePath(this->GetBinaryDirectory(), path), format);
} }
// Private methods. // Private methods.
......
...@@ -904,8 +904,10 @@ bool cmMakefileTargetGenerator::WriteMakeRule( ...@@ -904,8 +904,10 @@ bool cmMakefileTargetGenerator::WriteMakeRule(
o != outputs.end(); ++o) { o != outputs.end(); ++o) {
// Touch the extra output so "make" knows that it was updated, // Touch the extra output so "make" knows that it was updated,
// but only if the output was acually created. // but only if the output was acually created.
std::string const out = this->Convert(*o, cmOutputConverter::HOME_OUTPUT, std::string const out = this->LocalGenerator->ConvertToOutputFormat(
cmOutputConverter::SHELL); this->LocalGenerator->ConvertToRelativePath(
this->LocalGenerator->GetBinaryDirectory(), *o),
cmOutputConverter::SHELL);
std::vector<std::string> output_commands; std::vector<std::string> output_commands;
bool o_symbolic = false; bool o_symbolic = false;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment