diff options
author | Brad King <brad.king@kitware.com> | 2018-11-28 14:07:13 (GMT) |
---|---|---|
committer | Kitware Robot <kwrobot@kitware.com> | 2018-11-28 14:07:45 (GMT) |
commit | 772edffbf0c08fc0a6fcf74fb98545b7afcfee13 (patch) | |
tree | 76c783267933679031d892f16960fd2a1f87b3f6 /Source/cmMakefileTargetGenerator.cxx | |
parent | 58ebbf14c232d647e920727225dbf4c64d648128 (diff) | |
parent | 3e6058078433089f145903d25e06dafadeee9629 (diff) | |
download | CMake-772edffbf0c08fc0a6fcf74fb98545b7afcfee13.zip CMake-772edffbf0c08fc0a6fcf74fb98545b7afcfee13.tar.gz CMake-772edffbf0c08fc0a6fcf74fb98545b7afcfee13.tar.bz2 |
Merge topic 'readability-static-accessed-through-instance'
3e60580784 clang-tidy: Fix readability-static-accessed-through-instance
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2647
Diffstat (limited to 'Source/cmMakefileTargetGenerator.cxx')
-rw-r--r-- | Source/cmMakefileTargetGenerator.cxx | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/Source/cmMakefileTargetGenerator.cxx b/Source/cmMakefileTargetGenerator.cxx index 9acae49..a79425e 100644 --- a/Source/cmMakefileTargetGenerator.cxx +++ b/Source/cmMakefileTargetGenerator.cxx @@ -1236,8 +1236,9 @@ void cmMakefileTargetGenerator::WriteObjectsVariable( } for (std::string const& obj : this->Objects) { *this->BuildFileStream << " " << lineContinue << "\n"; - *this->BuildFileStream << this->LocalGenerator->ConvertToQuotedOutputPath( - obj.c_str(), useWatcomQuote); + *this->BuildFileStream + << cmLocalUnixMakefileGenerator3::ConvertToQuotedOutputPath( + obj.c_str(), useWatcomQuote); } *this->BuildFileStream << "\n"; @@ -1258,8 +1259,9 @@ void cmMakefileTargetGenerator::WriteObjectsVariable( object = this->LocalGenerator->MaybeConvertToRelativePath(currentBinDir, obj); *this->BuildFileStream << " " << lineContinue << "\n"; - *this->BuildFileStream << this->LocalGenerator->ConvertToQuotedOutputPath( - obj.c_str(), useWatcomQuote); + *this->BuildFileStream + << cmLocalUnixMakefileGenerator3::ConvertToQuotedOutputPath( + obj.c_str(), useWatcomQuote); } *this->BuildFileStream << "\n" << "\n"; |