diff options
| author | Brad King <brad.king@kitware.com> | 2019-02-22 16:19:09 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2019-02-22 16:19:09 (GMT) |
| commit | 6ebe40c6ae736157c2cd036ee01b771ae399b11d (patch) | |
| tree | 785a8455f0f2d995f1b816c4957138baff49271b /Source | |
| parent | c925166764800be637ffc6d1df5086ebcabb766d (diff) | |
| parent | d3b765d4510b73ee17df0e2bee0f7b9a355c5cba (diff) | |
| download | CMake-6ebe40c6ae736157c2cd036ee01b771ae399b11d.zip CMake-6ebe40c6ae736157c2cd036ee01b771ae399b11d.tar.gz CMake-6ebe40c6ae736157c2cd036ee01b771ae399b11d.tar.bz2 | |
Merge branch 'remove-exclude-from-all-warning' into release-3.14
Merge-request: !3002
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmInstallTargetGenerator.cxx | 16 | ||||
| -rw-r--r-- | Source/cmInstallTargetGenerator.h | 1 |
2 files changed, 0 insertions, 17 deletions
diff --git a/Source/cmInstallTargetGenerator.cxx b/Source/cmInstallTargetGenerator.cxx index 59701a1..9d3a6bb 100644 --- a/Source/cmInstallTargetGenerator.cxx +++ b/Source/cmInstallTargetGenerator.cxx @@ -41,22 +41,6 @@ cmInstallTargetGenerator::cmInstallTargetGenerator( cmInstallTargetGenerator::~cmInstallTargetGenerator() = default; -void cmInstallTargetGenerator::GenerateScript(std::ostream& os) -{ - // Warn if installing an exclude-from-all target. - if (this->Target->GetPropertyAsBool("EXCLUDE_FROM_ALL")) { - std::ostringstream msg; - msg << "WARNING: Target \"" << this->Target->GetName() - << "\" has EXCLUDE_FROM_ALL set and will not be built by default " - << "but an install rule has been provided for it. CMake does " - << "not define behavior for this case."; - cmSystemTools::Message(msg.str(), "Warning"); - } - - // Perform the main install script generation. - this->cmInstallGenerator::GenerateScript(os); -} - void cmInstallTargetGenerator::GenerateScriptForConfig( std::ostream& os, const std::string& config, Indent indent) { diff --git a/Source/cmInstallTargetGenerator.h b/Source/cmInstallTargetGenerator.h index 715b4ae..6df5b1a 100644 --- a/Source/cmInstallTargetGenerator.h +++ b/Source/cmInstallTargetGenerator.h @@ -69,7 +69,6 @@ public: cmListFileBacktrace const& GetBacktrace() const { return this->Backtrace; } protected: - void GenerateScript(std::ostream& os) override; void GenerateScriptForConfig(std::ostream& os, const std::string& config, Indent indent) override; void GenerateScriptForConfigObjectLibrary(std::ostream& os, |