diff options
| author | Joerg Bornemann <joerg.bornemann@qt.io> | 2020-07-16 08:15:04 (GMT) |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@qt.io> | 2020-07-21 15:16:26 (GMT) |
| commit | 2cdaf43d966f8407f0fb75ceb131fdca16617915 (patch) | |
| tree | 15e3284091c62ca73b22fa15ea1a93770c97305d /Source/cmGlobalUnixMakefileGenerator3.cxx | |
| parent | c7b7547d8da6b9a4225d111440d0cf6c2f55914d (diff) | |
| download | CMake-2cdaf43d966f8407f0fb75ceb131fdca16617915.zip CMake-2cdaf43d966f8407f0fb75ceb131fdca16617915.tar.gz CMake-2cdaf43d966f8407f0fb75ceb131fdca16617915.tar.bz2 | |
Allow generator expressions in the EXCLUDE_FROM_ALL target property
This allows for setting EXCLUDE_FROM_ALL, conditional on the build
configuration. However, only the Ninja Multi-Config generator supports
different property values per config. All other multi-config
generators will yield an error in that situation.
Fixes: #20923
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 c31983b..d45fc01 100644 --- a/Source/cmGlobalUnixMakefileGenerator3.cxx +++ b/Source/cmGlobalUnixMakefileGenerator3.cxx @@ -416,7 +416,7 @@ void cmGlobalUnixMakefileGenerator3::WriteDirectoryRule2( std::vector<std::string> depends; for (DirectoryTarget::Target const& t : dt.Targets) { // Add this to the list of depends rules in this directory. - if ((!check_all || !t.ExcludeFromAll) && + if ((!check_all || t.ExcludedFromAllInConfigs.empty()) && (!check_relink || t.GT->NeedRelinkBeforeInstall(lg->GetConfigName()))) { // The target may be from a different directory; use its local gen. @@ -846,7 +846,7 @@ void cmGlobalUnixMakefileGenerator3::InitializeProgressMarks() cmLocalGenerator* tlg = gt->GetLocalGenerator(); if (gt->GetType() == cmStateEnums::INTERFACE_LIBRARY || - gt->GetPropertyAsBool("EXCLUDE_FROM_ALL")) { + IsExcluded(lg.get(), gt.get())) { continue; } |