Pass EXCLUDE_FROM_ALL from directory to targets

When a target is created it now inherits the EXCLUDE_FROM_ALL property
from its directory. This change makes it possible to include a target
in "all", even if its directory has been marked as EXCLUDE_FROM_ALL.
This commit is contained in:
Zack Galbreath
2019-01-15 17:26:02 -06:00
parent bd3685b6cf
commit dc6888573d
14 changed files with 92 additions and 29 deletions
+2 -2
View File
@@ -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();
@@ -767,7 +767,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();