diff options
| author | Brad King <brad.king@kitware.com> | 2021-05-25 14:00:25 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2021-05-25 14:00:34 (GMT) |
| commit | 2d6d77ec1d929175c285fbc22944276b604e9cbf (patch) | |
| tree | f944fbb75e715d7b34d95095fc1ca7280fb8eb30 /Source | |
| parent | 0f553b14b415b96ccea8a9dc9bd6537e5475d150 (diff) | |
| parent | bf75369ed40f0adfe687396573b804ae6209161d (diff) | |
| download | CMake-2d6d77ec1d929175c285fbc22944276b604e9cbf.zip CMake-2d6d77ec1d929175c285fbc22944276b604e9cbf.tar.gz CMake-2d6d77ec1d929175c285fbc22944276b604e9cbf.tar.bz2 | |
Merge topic 'cmp0082-exclude-from-all'
bf75369ed4 Merge branch 'master' into cmp0082-exclude-from-all
38f2562d5b CMP0082: Check EXCLUDE_FROM_ALL property at generate time
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6158
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmInstallSubdirectoryGenerator.cxx | 6 | ||||
| -rw-r--r-- | Source/cmInstallSubdirectoryGenerator.h | 1 | ||||
| -rw-r--r-- | Source/cmMakefile.cxx | 2 |
3 files changed, 4 insertions, 5 deletions
diff --git a/Source/cmInstallSubdirectoryGenerator.cxx b/Source/cmInstallSubdirectoryGenerator.cxx index 0fcfa54..794694e 100644 --- a/Source/cmInstallSubdirectoryGenerator.cxx +++ b/Source/cmInstallSubdirectoryGenerator.cxx @@ -14,10 +14,10 @@ #include "cmSystemTools.h" cmInstallSubdirectoryGenerator::cmInstallSubdirectoryGenerator( - cmMakefile* makefile, std::string binaryDirectory, bool excludeFromAll, + cmMakefile* makefile, std::string binaryDirectory, cmListFileBacktrace backtrace) : cmInstallGenerator("", std::vector<std::string>(), "", MessageDefault, - excludeFromAll, false, std::move(backtrace)) + false, false, std::move(backtrace)) , Makefile(makefile) , BinaryDirectory(std::move(binaryDirectory)) { @@ -52,7 +52,7 @@ bool cmInstallSubdirectoryGenerator::Compute(cmLocalGenerator* lg) void cmInstallSubdirectoryGenerator::GenerateScript(std::ostream& os) { - if (!this->ExcludeFromAll) { + if (!this->Makefile->GetPropertyAsBool("EXCLUDE_FROM_ALL")) { cmPolicies::PolicyStatus status = this->LocalGenerator->GetPolicyStatus(cmPolicies::CMP0082); switch (status) { diff --git a/Source/cmInstallSubdirectoryGenerator.h b/Source/cmInstallSubdirectoryGenerator.h index 614cef9..f174d07 100644 --- a/Source/cmInstallSubdirectoryGenerator.h +++ b/Source/cmInstallSubdirectoryGenerator.h @@ -21,7 +21,6 @@ class cmInstallSubdirectoryGenerator : public cmInstallGenerator public: cmInstallSubdirectoryGenerator(cmMakefile* makefile, std::string binaryDirectory, - bool excludeFromAll, cmListFileBacktrace backtrace); ~cmInstallSubdirectoryGenerator() override; diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx index 4ffd47b..675ff1d 100644 --- a/Source/cmMakefile.cxx +++ b/Source/cmMakefile.cxx @@ -1844,7 +1844,7 @@ void cmMakefile::AddSubDirectory(const std::string& srcPath, } this->AddInstallGenerator(cm::make_unique<cmInstallSubdirectoryGenerator>( - subMf, binPath, excludeFromAll, this->GetBacktrace())); + subMf, binPath, this->GetBacktrace())); } const std::string& cmMakefile::GetCurrentSourceDirectory() const |