diff options
| author | Brad King <brad.king@kitware.com> | 2019-09-30 09:19:21 -0400 |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2019-09-30 09:19:21 -0400 |
| commit | 05d7ca14e99ee8ad36da01ddb314d0b90ab41874 (patch) | |
| tree | c923027983a11aef0edb53946ab94aa5fc5f1e2d /Source/cmGlobalUnixMakefileGenerator3.cxx | |
| parent | 156b56480a786db4d967bde5eb6d5edee56a27d0 (diff) | |
| parent | b3b1c7bf3afc8f33fa69b79f47f778cb781ac3c7 (diff) | |
| download | cmake-05d7ca14e99ee8ad36da01ddb314d0b90ab41874.tar.gz | |
Merge branch 'backport-3.14-fix-EXCLUDE_FROM_ALL-subdir-all'
Diffstat (limited to 'Source/cmGlobalUnixMakefileGenerator3.cxx')
| -rw-r--r-- | Source/cmGlobalUnixMakefileGenerator3.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/cmGlobalUnixMakefileGenerator3.cxx b/Source/cmGlobalUnixMakefileGenerator3.cxx index c63633469a..4eb2252e98 100644 --- a/Source/cmGlobalUnixMakefileGenerator3.cxx +++ b/Source/cmGlobalUnixMakefileGenerator3.cxx @@ -718,7 +718,7 @@ void cmGlobalUnixMakefileGenerator3::WriteConvenienceRules2( localName, depends, commands, true); // add the all/all dependency - if (!this->IsExcluded(gtarget)) { + if (!this->IsExcluded(this->LocalGenerators[0], gtarget)) { depends.clear(); depends.push_back(localName); commands.clear(); @@ -782,7 +782,7 @@ void cmGlobalUnixMakefileGenerator3::WriteConvenienceRules2( "Pre-install relink rule for target.", localName, depends, commands, true); - if (!this->IsExcluded(gtarget)) { + if (!this->IsExcluded(this->LocalGenerators[0], gtarget)) { depends.clear(); depends.push_back(localName); commands.clear(); |