reactos/CMake
1
0
Fork 0
mirror of https://github.com/reactos/CMake.git synced 2025-02-25 14:41:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

cmMakefileTargetGenerator: Inline WriteObjectBuildFile in only call site

Browse Source
This commit is contained in:
Brad King 2019-10-16 13:11:20 -04:00
parent 9150c818b7
commit 0b10b3ed6b
2 changed files with 4 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
Source/cmMakefileTargetGenerator.cxx
View File

@ -423,25 +423,17 @@ void cmMakefileTargetGenerator::WriteObjectRuleFiles(
// Create the directory containing the object file. This may be a
// subdirectory under the target's directory.
std::string dir = cmSystemTools::GetFilenamePath(obj);
cmSystemTools::MakeDirectory(this->LocalGenerator->ConvertToFullPath(dir));
{
std::string dir = cmSystemTools::GetFilenamePath(obj);
cmSystemTools::MakeDirectory(this->LocalGenerator->ConvertToFullPath(dir));
}
// Save this in the target's list of object files.
this->Objects.push_back(obj);
this->CleanFiles.insert(obj);
// TODO: Remove
// std::string relativeObj
//= this->LocalGenerator->GetHomeRelativeOutputPath();
// relativeObj += obj;
// we compute some depends when writing the depend.make that we will also
// use in the build.make, same with depMakeFile
std::vector<std::string> depends;
// generate the build rule file
this->WriteObjectBuildFile(obj, lang, source, depends);
// The object file should be checked for dependency integrity.
std::string objFullPath =
cmStrCat(this->LocalGenerator->GetCurrentBinaryDirectory(), '/', obj);
@ -450,12 +442,7 @@ void cmMakefileTargetGenerator::WriteObjectRuleFiles(
cmSystemTools::CollapseFullPath(source.GetFullPath());
this->LocalGenerator->AddImplicitDepends(this->GeneratorTarget, lang,
objFullPath, srcFullPath);
}
void cmMakefileTargetGenerator::WriteObjectBuildFile(
std::string& obj, const std::string& lang, cmSourceFile const& source,
std::vector<std::string>& depends)
{
this->LocalGenerator->AppendRuleDepend(depends,
this->FlagFileNameFull.c_str());
this->LocalGenerator->AppendRuleDepends(depends,

5
Source/cmMakefileTargetGenerator.h
View File

@ -91,11 +91,6 @@ protected:
// write the rules for an object
void WriteObjectRuleFiles(cmSourceFile const& source);
// write the build rule for an object
void WriteObjectBuildFile(std::string& obj, const std::string& lang,
cmSourceFile const& source,
std::vector<std::string>& depends);
// write the depend.make file for an object
void WriteObjectDependRules(cmSourceFile const& source,
std::vector<std::string>& depends);