diff options
| author | Stephen Kelly <steveire@gmail.com> | 2015-08-02 08:39:19 (GMT) |
|---|---|---|
| committer | Stephen Kelly <steveire@gmail.com> | 2015-08-24 18:03:29 (GMT) |
| commit | 65c434e1b0247a47df763a616d1c8fdb20daba5c (patch) | |
| tree | 7e22d8034a60cb27302f6fc0b30abc858d193a85 /Source/cmGlobalUnixMakefileGenerator3.cxx | |
| parent | be56feb6184e80eab5ce93b5ab81308452a5559f (diff) | |
| download | CMake-65c434e1b0247a47df763a616d1c8fdb20daba5c.zip CMake-65c434e1b0247a47df763a616d1c8fdb20daba5c.tar.gz CMake-65c434e1b0247a47df763a616d1c8fdb20daba5c.tar.bz2 | |
cmGlobalUnixMakefileGenerator3: Inline an IsExcluded call.
Diffstat (limited to 'Source/cmGlobalUnixMakefileGenerator3.cxx')
| -rw-r--r-- | Source/cmGlobalUnixMakefileGenerator3.cxx | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/Source/cmGlobalUnixMakefileGenerator3.cxx b/Source/cmGlobalUnixMakefileGenerator3.cxx index b240924..6a13977 100644 --- a/Source/cmGlobalUnixMakefileGenerator3.cxx +++ b/Source/cmGlobalUnixMakefileGenerator3.cxx @@ -936,9 +936,17 @@ void cmGlobalUnixMakefileGenerator3::InitializeProgressMarks() cmGeneratorTarget* gt = this->GetGeneratorTarget(&target); + cmLocalGenerator* tlg = gt->GetLocalGenerator(); + + if(gt->GetType() == cmTarget::INTERFACE_LIBRARY + || gt->Target->GetPropertyAsBool("EXCLUDE_FROM_ALL")) + { + continue; + } + // Consider the directory containing the target and all its // parents until something excludes the target. - for(cmLocalGenerator* clg = lg; clg && !this->IsExcluded(clg, gt); + for(cmLocalGenerator* clg = lg; clg && !this->IsExcluded(clg, tlg); clg = clg->GetParent()) { // This local generator includes the target. |