diff options
author | Stephen Kelly <steveire@gmail.com> | 2016-08-27 16:09:04 (GMT) |
---|---|---|
committer | Stephen Kelly <steveire@gmail.com> | 2016-09-19 19:36:13 (GMT) |
commit | 25c39ac28b42234d08c3906ce24ac739f6111506 (patch) | |
tree | 11e85b319524214585b105947237026eded0d601 /Source/cmLocalUnixMakefileGenerator3.cxx | |
parent | 516e79ba2722adb662000773e742187815723702 (diff) | |
download | CMake-25c39ac28b42234d08c3906ce24ac739f6111506.zip CMake-25c39ac28b42234d08c3906ce24ac739f6111506.tar.gz CMake-25c39ac28b42234d08c3906ce24ac739f6111506.tar.bz2 |
Convert: Inline HOME_OUTPUT MAKERULE conversion
Diffstat (limited to 'Source/cmLocalUnixMakefileGenerator3.cxx')
-rw-r--r-- | Source/cmLocalUnixMakefileGenerator3.cxx | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/Source/cmLocalUnixMakefileGenerator3.cxx b/Source/cmLocalUnixMakefileGenerator3.cxx index 697d856..59dc445 100644 --- a/Source/cmLocalUnixMakefileGenerator3.cxx +++ b/Source/cmLocalUnixMakefileGenerator3.cxx @@ -556,8 +556,8 @@ void cmLocalUnixMakefileGenerator3::WriteMakeRule( } // Construct the left hand side of the rule. - std::string tgt = this->Convert(target, cmOutputConverter::HOME_OUTPUT, - cmOutputConverter::MAKERULE); + std::string tgt = cmSystemTools::ConvertToOutputPath( + this->ConvertToRelativePath(this->GetBinaryDirectory(), target).c_str()); const char* space = ""; if (tgt.size() == 1) { @@ -584,8 +584,9 @@ void cmLocalUnixMakefileGenerator3::WriteMakeRule( for (std::vector<std::string>::const_iterator dep = depends.begin(); dep != depends.end(); ++dep) { replace = *dep; - replace = this->Convert(replace, cmOutputConverter::HOME_OUTPUT, - cmOutputConverter::MAKERULE); + replace = cmSystemTools::ConvertToOutputPath( + this->ConvertToRelativePath(this->GetBinaryDirectory(), replace) + .c_str()); os << cmMakeSafe(tgt) << space << ": " << cmMakeSafe(replace) << "\n"; } } |