diff options
author | Brad King <brad.king@kitware.com> | 2018-10-11 11:43:02 (GMT) |
---|---|---|
committer | Brad King <brad.king@kitware.com> | 2018-10-11 12:11:21 (GMT) |
commit | d26f5b68895b71c53d8ba3a77d1a99fbdd0decd3 (patch) | |
tree | ddf656633a15d2de2e9e7a6188216e42a886cb38 /Tests | |
parent | bcfb2457030efcfdb84eef02230aa47f18072555 (diff) | |
parent | 0f48fbaa72fa254faaed6b586fcaa5d3c5c77798 (diff) | |
download | CMake-d26f5b68895b71c53d8ba3a77d1a99fbdd0decd3.zip CMake-d26f5b68895b71c53d8ba3a77d1a99fbdd0decd3.tar.gz CMake-d26f5b68895b71c53d8ba3a77d1a99fbdd0decd3.tar.bz2 |
Merge branch 'backport-revert-install-code-script-genex' into release-3.13
Merge-request: !2474
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 d00491f..0000000 --- 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 9844158..0000000 --- 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 1663b39..0000000 --- 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 422c532..0000000 --- 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 3b8513d..0000000 --- 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 91524a6..ec022ca 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) |