Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
CMake
CMake
Commits
fe9714e2
Commit
fe9714e2
authored
Jul 15, 2005
by
Bill Hoffman
Browse files
ENH: fix static build of vtk with cmake by having custom targets chain depend information
parent
95e2b607
Changes
2
Hide whitespace changes
Inline
Side-by-side
Source/cmGlobalUnixMakefileGenerator3.cxx
View file @
fe9714e2
...
...
@@ -889,7 +889,7 @@ cmGlobalUnixMakefileGenerator3
if
(
emitted
.
insert
(
lib
->
first
).
second
)
{
// Add this dependency.
this
->
AppendAnyGlobalDepend
(
depends
,
lib
->
first
.
c_str
());
this
->
AppendAnyGlobalDepend
(
depends
,
lib
->
first
.
c_str
()
,
emitted
);
}
}
}
...
...
@@ -903,7 +903,7 @@ cmGlobalUnixMakefileGenerator3
if
(
emitted
.
insert
(
*
util
).
second
)
{
// Add this dependency.
this
->
AppendAnyGlobalDepend
(
depends
,
util
->
c_str
());
this
->
AppendAnyGlobalDepend
(
depends
,
util
->
c_str
()
,
emitted
);
}
}
}
...
...
@@ -912,7 +912,8 @@ cmGlobalUnixMakefileGenerator3
//----------------------------------------------------------------------------
void
cmGlobalUnixMakefileGenerator3
::
AppendAnyGlobalDepend
(
std
::
vector
<
std
::
string
>&
depends
,
const
char
*
name
)
::
AppendAnyGlobalDepend
(
std
::
vector
<
std
::
string
>&
depends
,
const
char
*
name
,
std
::
set
<
cmStdString
>&
emitted
)
{
cmTarget
*
result
;
...
...
@@ -930,6 +931,21 @@ cmGlobalUnixMakefileGenerator3
std
::
string
tgtName
=
lg3
->
GetRelativeTargetDirectory
(
*
result
);
tgtName
+=
"/all"
;
depends
.
push_back
(
tgtName
);
if
(
result
->
GetType
()
==
cmTarget
::
STATIC_LIBRARY
)
{
const
cmTarget
::
LinkLibraries
&
tlibs
=
result
->
GetLinkLibraries
();
for
(
cmTarget
::
LinkLibraries
::
const_iterator
lib
=
tlibs
.
begin
();
lib
!=
tlibs
.
end
();
++
lib
)
{
// Don't emit the same library twice for this target.
if
(
emitted
.
insert
(
lib
->
first
).
second
)
{
// Add this dependency.
this
->
AppendAnyGlobalDepend
(
depends
,
lib
->
first
.
c_str
(),
emitted
);
}
}
}
return
;
}
}
...
...
Source/cmGlobalUnixMakefileGenerator3.h
View file @
fe9714e2
...
...
@@ -108,7 +108,7 @@ protected:
void
AppendGlobalTargetDepends
(
std
::
vector
<
std
::
string
>&
depends
,
cmTarget
&
target
);
void
AppendAnyGlobalDepend
(
std
::
vector
<
std
::
string
>&
depends
,
const
char
*
name
);
const
char
*
name
,
std
::
set
<
cmStdString
>&
emitted
);
// does this generator need a requires step for any of its targets
bool
NeedRequiresStep
(
cmLocalUnixMakefileGenerator3
*
lg
);
...
...
Write
Preview
Supports
Markdown
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