mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-06 05:40:54 -06:00
Code Issues Packages Projects Releases Wiki Activity

install: Revert CODE,SCRIPT support for generator expressions

Browse Source 
Revert commit v3.13.0-rc1~441^2 (install: Teach CODE,SCRIPT modes to
evaluate generator expressions, 2018-05-29).  Unfortunately it has
been found to break existing code in a real project, e.g.

    install(CODE [[
        message("$<FOOBAR>")
    ]])

Address this regression by reverting support for the 3.13 release
series.  Support can be restored later with a policy for compatibility.

Issue: #15785
Fixes: #18435
This commit is contained in:
Brad King
2018-10-11 06:59:38 -04:00
parent fd02538974
commit 0f48fbaa72
10 changed files with 9 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
Source/cmInstallScriptGenerator.cxx
View File

@@ -2,7 +2,6 @@
file Copyright.txt or https://cmake.org/licensing for details. */
#include "cmInstallScriptGenerator.h"
#include "cmGeneratorExpression.h"
#include "cmScriptGenerator.h"
#include <ostream>
@@ -17,47 +16,24 @@ cmInstallScriptGenerator::cmInstallScriptGenerator(const char* script,
, Script(script)
, Code(code)
{
// We need per-config actions if the script has generator expressions.
if (cmGeneratorExpression::Find(Script) != std::string::npos) {
this->ActionsPerConfig = true;
}
}
cmInstallScriptGenerator::~cmInstallScriptGenerator()
{
}
void cmInstallScriptGenerator::Compute(cmLocalGenerator* lg)
void cmInstallScriptGenerator::GenerateScript(std::ostream& os)
{
this->LocalGenerator = lg;
}
Indent indent;
std::string component_test =
this->CreateComponentTest(this->Component.c_str(), this->ExcludeFromAll);
os << indent << "if(" << component_test << ")\n";
void cmInstallScriptGenerator::AddScriptInstallRule(std::ostream& os,
Indent indent,
std::string const& script)
{
if (this->Code) {
os << indent.Next() << script << "\n";
os << indent.Next() << this->Script << "\n";
} else {
os << indent.Next() << "include(\"" << script << "\")\n";
os << indent.Next() << "include(\"" << this->Script << "\")\n";
}
}
void cmInstallScriptGenerator::GenerateScriptActions(std::ostream& os,
Indent indent)
{
if (this->ActionsPerConfig) {
this->cmInstallGenerator::GenerateScriptActions(os, indent);
} else {
this->AddScriptInstallRule(os, indent, this->Script);
}
}
void cmInstallScriptGenerator::GenerateScriptForConfig(
std::ostream& os, const std::string& config, Indent indent)
{
cmGeneratorExpression ge;
std::unique_ptr<cmCompiledGeneratorExpression> cge = ge.Parse(this->Script);
this->AddScriptInstallRule(os, indent,
cge->Evaluate(this->LocalGenerator, config));
os << indent << "endif()\n\n";
}