Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
CMake
CMake
Commits
0b10b3ed
Commit
0b10b3ed
authored
Oct 16, 2019
by
Brad King
1
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
cmMakefileTargetGenerator: Inline WriteObjectBuildFile in only call site
parent
9150c818
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
22 deletions
+4
-22
Source/cmMakefileTargetGenerator.cxx
Source/cmMakefileTargetGenerator.cxx
+4
-17
Source/cmMakefileTargetGenerator.h
Source/cmMakefileTargetGenerator.h
+0
-5
No files found.
Source/cmMakefileTargetGenerator.cxx
View file @
0b10b3ed
...
...
@@ -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
,
...
...
Source/cmMakefileTargetGenerator.h
View file @
0b10b3ed
...
...
@@ -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
);
...
...
Brad King
@brad.king
mentioned in commit
1c84b5c8
·
Oct 18, 2019
mentioned in commit
1c84b5c8
mentioned in commit 1c84b5c86f23d3e1998f67d0cd417b317cd9558b
Toggle commit list
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment