Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
CMake
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
André Pedro
CMake
Commits
8bbd5db4
Commit
8bbd5db4
authored
8 years ago
by
Florent Castelli
Committed by
Brad King
8 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Ninja: Make bundle resources a dependency of their target
Fixes #13816.
parent
c2c2a2f4
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
Source/cmNinjaTargetGenerator.cxx
+6
-2
6 additions, 2 deletions
Source/cmNinjaTargetGenerator.cxx
Source/cmNinjaTargetGenerator.h
+1
-0
1 addition, 0 deletions
Source/cmNinjaTargetGenerator.h
with
7 additions
and
2 deletions
Source/cmNinjaTargetGenerator.cxx
+
6
−
2
View file @
8bbd5db4
...
...
@@ -487,6 +487,10 @@ void cmNinjaTargetGenerator::WriteObjectBuildStatements()
this
->
GetLocalGenerator
()
->
AppendTargetDepends
(
this
->
GeneratorTarget
,
orderOnlyDeps
);
// Add order-only dependencies on other files associated with the target.
orderOnlyDeps
.
insert
(
orderOnlyDeps
.
end
(),
this
->
ExtraFiles
.
begin
(),
this
->
ExtraFiles
.
end
());
// Add order-only dependencies on custom command outputs.
for
(
std
::
vector
<
cmCustomCommand
const
*>::
const_iterator
cci
=
this
->
CustomCommands
.
begin
();
...
...
@@ -717,8 +721,8 @@ void cmNinjaTargetGenerator::MacOSXContentGeneratorType::operator()(
this
->
Generator
->
GetGlobalGenerator
()
->
WriteMacOSXContentBuild
(
input
,
output
);
// Add as a dependency
of all
target so that it gets called.
this
->
Generator
->
GetGlobalGenerator
()
->
AddDependencyToAll
(
output
);
// Add as a dependency
to the
target so that it gets called.
this
->
Generator
->
ExtraFiles
.
push_back
(
output
);
}
void
cmNinjaTargetGenerator
::
addPoolNinjaVariable
(
...
...
This diff is collapsed.
Click to expand it.
Source/cmNinjaTargetGenerator.h
+
1
−
0
View file @
8bbd5db4
...
...
@@ -156,6 +156,7 @@ private:
/// List of object files for this target.
cmNinjaDeps
Objects
;
std
::
vector
<
cmCustomCommand
const
*>
CustomCommands
;
cmNinjaDeps
ExtraFiles
;
};
#endif // ! cmNinjaTargetGenerator_h
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment