diff options
| author | Brad King <brad.king@kitware.com> | 2019-01-25 13:05:45 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2019-01-25 13:06:54 (GMT) |
| commit | 24b6e4830d9027e63db7dfafa500aaeb652d3a4c (patch) | |
| tree | b5697a362f3573609e1228bff0629d162b619de1 /Source/cmGlobalUnixMakefileGenerator3.cxx | |
| parent | 15bc4a25e50d18ba081f31ffd8fc4724b83460b5 (diff) | |
| parent | dc6888573da15cd7ddb9f91b70ef3e6c4e7cae15 (diff) | |
| download | CMake-24b6e4830d9027e63db7dfafa500aaeb652d3a4c.zip CMake-24b6e4830d9027e63db7dfafa500aaeb652d3a4c.tar.gz CMake-24b6e4830d9027e63db7dfafa500aaeb652d3a4c.tar.bz2 | |
Merge topic 'exclude_from_all'
dc6888573d Pass EXCLUDE_FROM_ALL from directory to targets
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2816
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 f504846..792adc0 100644 --- a/Source/cmGlobalUnixMakefileGenerator3.cxx +++ b/Source/cmGlobalUnixMakefileGenerator3.cxx @@ -702,7 +702,7 @@ void cmGlobalUnixMakefileGenerator3::WriteConvenienceRules2( localName, depends, commands, true); // add the all/all dependency - if (!this->IsExcluded(this->LocalGenerators[0], gtarget)) { + if (!this->IsExcluded(gtarget)) { depends.clear(); depends.push_back(localName); commands.clear(); @@ -766,7 +766,7 @@ void cmGlobalUnixMakefileGenerator3::WriteConvenienceRules2( "Pre-install relink rule for target.", localName, depends, commands, true); - if (!this->IsExcluded(this->LocalGenerators[0], gtarget)) { + if (!this->IsExcluded(gtarget)) { depends.clear(); depends.push_back(localName); commands.clear(); |