diff options
| author | Brad King <brad.king@kitware.com> | 2013-10-08 14:58:40 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2013-10-08 14:58:40 (GMT) |
| commit | f8241136b42c7e1064ca8764c6fa5e17012127da (patch) | |
| tree | fcb5064ea98b99e5c4bea0cc9b9ade5863f14b46 /Source/cmGlobalUnixMakefileGenerator3.cxx | |
| parent | 5c57fdedb19897880e5c13f9a0dd35ad4087565c (diff) | |
| parent | ce0c303d62941d2b10098b1ec00de3ced8556919 (diff) | |
| download | CMake-f8241136b42c7e1064ca8764c6fa5e17012127da.zip CMake-f8241136b42c7e1064ca8764c6fa5e17012127da.tar.gz CMake-f8241136b42c7e1064ca8764c6fa5e17012127da.tar.bz2 | |
Merge topic 'INTERFACE_LIBRARY-target-type'
ce0c303 install: Teach EXPORT option to handle INTERFACE_LIBRARY targets
435c912 export: Add support for INTERFACE_LIBRARY targets
fe73226 Add the INTERFACE_LIBRARY target type.
Diffstat (limited to 'Source/cmGlobalUnixMakefileGenerator3.cxx')
| -rw-r--r-- | Source/cmGlobalUnixMakefileGenerator3.cxx | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/Source/cmGlobalUnixMakefileGenerator3.cxx b/Source/cmGlobalUnixMakefileGenerator3.cxx index 3a9dc44..9e23ae9 100644 --- a/Source/cmGlobalUnixMakefileGenerator3.cxx +++ b/Source/cmGlobalUnixMakefileGenerator3.cxx @@ -881,6 +881,10 @@ cmGlobalUnixMakefileGenerator3 for(TargetDependSet::const_iterator di = depends.begin(); di != depends.end(); ++di) { + if ((*di)->GetType() == cmTarget::INTERFACE_LIBRARY) + { + continue; + } count += this->CountProgressMarksInTarget(*di, emitted); } } @@ -967,6 +971,10 @@ cmGlobalUnixMakefileGenerator3 { // Create the target-level dependency. cmTarget const* dep = *i; + if (dep->GetType() == cmTarget::INTERFACE_LIBRARY) + { + continue; + } cmLocalUnixMakefileGenerator3* lg3 = static_cast<cmLocalUnixMakefileGenerator3*> (dep->GetMakefile()->GetLocalGenerator()); |