install: Revert CODE,SCRIPT support for generator expressions

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
-4
View File
@@ -442,10 +442,6 @@ example, the code
will print a message during installation. will print a message during installation.
The contents of ``SCRIPT`` or ``CODE`` may use "generator expressions" with
the syntax ``$<...>``. See the :manual:`cmake-generator-expressions(7)`
manual for available expressions.
Installing Exports Installing Exports
^^^^^^^^^^^^^^^^^^ ^^^^^^^^^^^^^^^^^^
-3
View File
@@ -61,9 +61,6 @@ Commands
* The :command:`add_link_options` command was created to add link * The :command:`add_link_options` command was created to add link
options in the current directory. options in the current directory.
* The :command:`install(CODE)` and :command:`install(SCRIPT)` commands
learned to support generator expressions.
* The :command:`install(TARGETS)` command learned to install targets * The :command:`install(TARGETS)` command learned to install targets
created outside the current directory. created outside the current directory.
+8 -32
View File
@@ -2,7 +2,6 @@
file Copyright.txt or https://cmake.org/licensing for details. */ file Copyright.txt or https://cmake.org/licensing for details. */
#include "cmInstallScriptGenerator.h" #include "cmInstallScriptGenerator.h"
#include "cmGeneratorExpression.h"
#include "cmScriptGenerator.h" #include "cmScriptGenerator.h"
#include <ostream> #include <ostream>
@@ -17,47 +16,24 @@ cmInstallScriptGenerator::cmInstallScriptGenerator(const char* script,
, Script(script) , Script(script)
, Code(code) , 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() 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) { if (this->Code) {
os << indent.Next() << script << "\n"; os << indent.Next() << this->Script << "\n";
} else { } else {
os << indent.Next() << "include(\"" << script << "\")\n"; os << indent.Next() << "include(\"" << this->Script << "\")\n";
} }
}
void cmInstallScriptGenerator::GenerateScriptActions(std::ostream& os, os << indent << "endif()\n\n";
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));
} }
+1 -12
View File
@@ -6,13 +6,10 @@
#include "cmConfigure.h" // IWYU pragma: keep #include "cmConfigure.h" // IWYU pragma: keep
#include "cmInstallGenerator.h" #include "cmInstallGenerator.h"
#include "cmScriptGenerator.h"
#include <iosfwd> #include <iosfwd>
#include <string> #include <string>
class cmLocalGenerator;
/** \class cmInstallScriptGenerator /** \class cmInstallScriptGenerator
* \brief Generate target installation rules. * \brief Generate target installation rules.
*/ */
@@ -23,18 +20,10 @@ public:
const char* component, bool exclude_from_all); const char* component, bool exclude_from_all);
~cmInstallScriptGenerator() override; ~cmInstallScriptGenerator() override;
void Compute(cmLocalGenerator* lg) override;
protected: protected:
void GenerateScriptActions(std::ostream& os, Indent indent) override; void GenerateScript(std::ostream& os) override;
void GenerateScriptForConfig(std::ostream& os, const std::string& config,
Indent indent) override;
void AddScriptInstallRule(std::ostream& os, Indent indent,
std::string const& script);
std::string Script; std::string Script;
bool Code; bool Code;
cmLocalGenerator* LocalGenerator;
}; };
#endif #endif
@@ -1 +0,0 @@
1
@@ -1,6 +0,0 @@
CMake Error:
Error evaluating generator expression:
\$<NOTAGENEX>
Expression did not evaluate to a known generator expression
@@ -1 +0,0 @@
install(CODE "message(\"$<NOTAGENEX>\")")
@@ -1,7 +0,0 @@
execute_process(COMMAND ${CMAKE_COMMAND} -P ${RunCMake_TEST_BINARY_DIR}/cmake_install.cmake
OUTPUT_VARIABLE out ERROR_VARIABLE err)
if(NOT out MATCHES "-- Install configuration: .*-- codegenexlib")
string(REGEX REPLACE "\n" "\n " out " ${out}")
string(APPEND RunCMake_TEST_FAILED
"\"-- codegenexlib\" was not found:\n${out}")
endif()
-2
View File
@@ -1,2 +0,0 @@
add_library( codegenexlib INTERFACE )
install(CODE "message( STATUS \"$<TARGET_PROPERTY:codegenexlib,NAME>\")")
@@ -65,8 +65,6 @@ run_cmake(CMP0062-NEW)
run_cmake(CMP0062-WARN) run_cmake(CMP0062-WARN)
run_cmake(TARGETS-NAMELINK_COMPONENT-bad-all) run_cmake(TARGETS-NAMELINK_COMPONENT-bad-all)
run_cmake(TARGETS-NAMELINK_COMPONENT-bad-exc) run_cmake(TARGETS-NAMELINK_COMPONENT-bad-exc)
run_cmake(CODE-genex)
run_cmake(CODE-genex-bad)
if(NOT RunCMake_GENERATOR STREQUAL "Xcode" OR NOT "$ENV{CMAKE_OSX_ARCHITECTURES}" MATCHES "[;$]") if(NOT RunCMake_GENERATOR STREQUAL "Xcode" OR NOT "$ENV{CMAKE_OSX_ARCHITECTURES}" MATCHES "[;$]")
run_install_test(FILES-TARGET_OBJECTS) run_install_test(FILES-TARGET_OBJECTS)