diff options
| author | Brad King <brad.king@kitware.com> | 2018-10-11 06:59:38 -0400 |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2018-10-11 07:05:55 -0400 |
| commit | 0f48fbaa72fa254faaed6b586fcaa5d3c5c77798 (patch) | |
| tree | 38520add1b903a77bdd51af9789c3cab9c869148 /Tests | |
| parent | fd02538974dd952a8639d371c2c0067d30d5469a (diff) | |
| download | cmake-0f48fbaa72fa254faaed6b586fcaa5d3c5c77798.tar.gz | |
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
Diffstat (limited to 'Tests')
| -rw-r--r-- | Tests/RunCMake/install/CODE-genex-bad-result.txt | 1 | ||||
| -rw-r--r-- | Tests/RunCMake/install/CODE-genex-bad-stderr.txt | 6 | ||||
| -rw-r--r-- | Tests/RunCMake/install/CODE-genex-bad.cmake | 1 | ||||
| -rw-r--r-- | Tests/RunCMake/install/CODE-genex-check.cmake | 7 | ||||
| -rw-r--r-- | Tests/RunCMake/install/CODE-genex.cmake | 2 | ||||
| -rw-r--r-- | Tests/RunCMake/install/RunCMakeTest.cmake | 2 |
6 files changed, 0 insertions, 19 deletions
diff --git a/Tests/RunCMake/install/CODE-genex-bad-result.txt b/Tests/RunCMake/install/CODE-genex-bad-result.txt deleted file mode 100644 index d00491fd7e..0000000000 --- a/Tests/RunCMake/install/CODE-genex-bad-result.txt +++ /dev/null @@ -1 +0,0 @@ -1 diff --git a/Tests/RunCMake/install/CODE-genex-bad-stderr.txt b/Tests/RunCMake/install/CODE-genex-bad-stderr.txt deleted file mode 100644 index 9844158689..0000000000 --- a/Tests/RunCMake/install/CODE-genex-bad-stderr.txt +++ /dev/null @@ -1,6 +0,0 @@ -CMake Error: - Error evaluating generator expression: - - \$<NOTAGENEX> - - Expression did not evaluate to a known generator expression diff --git a/Tests/RunCMake/install/CODE-genex-bad.cmake b/Tests/RunCMake/install/CODE-genex-bad.cmake deleted file mode 100644 index 1663b397cf..0000000000 --- a/Tests/RunCMake/install/CODE-genex-bad.cmake +++ /dev/null @@ -1 +0,0 @@ -install(CODE "message(\"$<NOTAGENEX>\")") diff --git a/Tests/RunCMake/install/CODE-genex-check.cmake b/Tests/RunCMake/install/CODE-genex-check.cmake deleted file mode 100644 index 422c53202c..0000000000 --- a/Tests/RunCMake/install/CODE-genex-check.cmake +++ /dev/null @@ -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() diff --git a/Tests/RunCMake/install/CODE-genex.cmake b/Tests/RunCMake/install/CODE-genex.cmake deleted file mode 100644 index 3b8513d640..0000000000 --- a/Tests/RunCMake/install/CODE-genex.cmake +++ /dev/null @@ -1,2 +0,0 @@ -add_library( codegenexlib INTERFACE ) -install(CODE "message( STATUS \"$<TARGET_PROPERTY:codegenexlib,NAME>\")") diff --git a/Tests/RunCMake/install/RunCMakeTest.cmake b/Tests/RunCMake/install/RunCMakeTest.cmake index 91524a6c40..ec022caa9a 100644 --- a/Tests/RunCMake/install/RunCMakeTest.cmake +++ b/Tests/RunCMake/install/RunCMakeTest.cmake @@ -65,8 +65,6 @@ run_cmake(CMP0062-NEW) run_cmake(CMP0062-WARN) run_cmake(TARGETS-NAMELINK_COMPONENT-bad-all) 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 "[;$]") run_install_test(FILES-TARGET_OBJECTS) |