diff options
author | Brad King <brad.king@kitware.com> | 2020-06-15 18:45:01 (GMT) |
---|---|---|
committer | Brad King <brad.king@kitware.com> | 2020-06-16 12:03:36 (GMT) |
commit | 6308bfb73777a7231928509ce651b45dfb6aa657 (patch) | |
tree | 8101f0b6b68edd346e839e543bd3f426fd15dc07 /Tests/RunCMake/GeneratorExpression | |
parent | abe1c2749946a067fa71cb92ba088d3b2acabc8a (diff) | |
download | CMake-6308bfb73777a7231928509ce651b45dfb6aa657.zip CMake-6308bfb73777a7231928509ce651b45dfb6aa657.tar.gz CMake-6308bfb73777a7231928509ce651b45dfb6aa657.tar.bz2 |
Tests: Factor out RunCMake.GenEx-GENEX_EVAL test
Move the `GENEX_EVAL` cases and friends out of `RunCMake.GeneratorExpression`.
Diffstat (limited to 'Tests/RunCMake/GeneratorExpression')
26 files changed, 0 insertions, 220 deletions
diff --git a/Tests/RunCMake/GeneratorExpression/GENEX_EVAL-check.cmake b/Tests/RunCMake/GeneratorExpression/GENEX_EVAL-check.cmake deleted file mode 100644 index df76740..0000000 --- a/Tests/RunCMake/GeneratorExpression/GENEX_EVAL-check.cmake +++ /dev/null @@ -1,6 +0,0 @@ -file(READ "${RunCMake_TEST_BINARY_DIR}/GENEX_EVAL-generated.txt" content) - -set(expected "BEFORE_PROPERTY1_AFTER") -if(NOT content STREQUAL expected) - set(RunCMake_TEST_FAILED "actual content:\n [[${content}]]\nbut expected:\n [[${expected}]]") -endif() diff --git a/Tests/RunCMake/GeneratorExpression/GENEX_EVAL-recursion1-result.txt b/Tests/RunCMake/GeneratorExpression/GENEX_EVAL-recursion1-result.txt deleted file mode 100644 index d00491f..0000000 --- a/Tests/RunCMake/GeneratorExpression/GENEX_EVAL-recursion1-result.txt +++ /dev/null @@ -1 +0,0 @@ -1 diff --git a/Tests/RunCMake/GeneratorExpression/GENEX_EVAL-recursion1-stderr.txt b/Tests/RunCMake/GeneratorExpression/GENEX_EVAL-recursion1-stderr.txt deleted file mode 100644 index 012dff6..0000000 --- a/Tests/RunCMake/GeneratorExpression/GENEX_EVAL-recursion1-stderr.txt +++ /dev/null @@ -1,26 +0,0 @@ -^CMake Error at GENEX_EVAL-recursion1.cmake:7 \(add_custom_target\): - Error evaluating generator expression: - - \$<GENEX_EVAL:\$<TARGET_PROPERTY:CUSTOM_PROPERTY>> - - Dependency loop found. -Call Stack \(most recent call first\): - CMakeLists.txt:3 \(include\) - - -CMake Error at GENEX_EVAL-recursion1.cmake:7 \(add_custom_target\): - Loop step 1 - - \$<GENEX_EVAL:\$<TARGET_PROPERTY:CUSTOM_PROPERTY>> - -Call Stack \(most recent call first\): - CMakeLists.txt:3 \(include\) - - -CMake Error at GENEX_EVAL-recursion1.cmake:7 \(add_custom_target\): - Loop step 2 - - \$<TARGET_GENEX_EVAL:recursion,\$<TARGET_PROPERTY:recursion,CUSTOM_PROPERTY>> - -Call Stack \(most recent call first\): - CMakeLists.txt:3 \(include\) diff --git a/Tests/RunCMake/GeneratorExpression/GENEX_EVAL-recursion1.cmake b/Tests/RunCMake/GeneratorExpression/GENEX_EVAL-recursion1.cmake deleted file mode 100644 index 6596a81..0000000 --- a/Tests/RunCMake/GeneratorExpression/GENEX_EVAL-recursion1.cmake +++ /dev/null @@ -1,9 +0,0 @@ - -enable_language(C) - -add_library (recursion SHARED empty.c) -set_property (TARGET recursion PROPERTY CUSTOM_PROPERTY "$<GENEX_EVAL:$<TARGET_PROPERTY:CUSTOM_PROPERTY>>") - -add_custom_target (drive - COMMAND echo "$<TARGET_GENEX_EVAL:recursion,$<TARGET_PROPERTY:recursion,CUSTOM_PROPERTY>>" - DEPENDS recursion) diff --git a/Tests/RunCMake/GeneratorExpression/GENEX_EVAL-recursion2-result.txt b/Tests/RunCMake/GeneratorExpression/GENEX_EVAL-recursion2-result.txt deleted file mode 100644 index d00491f..0000000 --- a/Tests/RunCMake/GeneratorExpression/GENEX_EVAL-recursion2-result.txt +++ /dev/null @@ -1 +0,0 @@ -1 diff --git a/Tests/RunCMake/GeneratorExpression/GENEX_EVAL-recursion2-stderr.txt b/Tests/RunCMake/GeneratorExpression/GENEX_EVAL-recursion2-stderr.txt deleted file mode 100644 index ed68400..0000000 --- a/Tests/RunCMake/GeneratorExpression/GENEX_EVAL-recursion2-stderr.txt +++ /dev/null @@ -1,26 +0,0 @@ -^CMake Error at GENEX_EVAL-recursion2.cmake:8 \(add_custom_target\): - Error evaluating generator expression: - - \$<GENEX_EVAL:\$<TARGET_PROPERTY:CUSTOM_PROPERTY2>> - - Dependency loop found. -Call Stack \(most recent call first\): - CMakeLists.txt:3 \(include\) - - -CMake Error at GENEX_EVAL-recursion2.cmake:8 \(add_custom_target\): - Loop step 1 - - \$<GENEX_EVAL:\$<TARGET_PROPERTY:CUSTOM_PROPERTY1>> - -Call Stack \(most recent call first\): - CMakeLists.txt:3 \(include\) - - -CMake Error at GENEX_EVAL-recursion2.cmake:8 \(add_custom_target\): - Loop step 2 - - \$<GENEX_EVAL:\$<TARGET_PROPERTY:CUSTOM_PROPERTY2>> - -Call Stack \(most recent call first\): - CMakeLists.txt:3 \(include\) diff --git a/Tests/RunCMake/GeneratorExpression/GENEX_EVAL-recursion2.cmake b/Tests/RunCMake/GeneratorExpression/GENEX_EVAL-recursion2.cmake deleted file mode 100644 index 773749f..0000000 --- a/Tests/RunCMake/GeneratorExpression/GENEX_EVAL-recursion2.cmake +++ /dev/null @@ -1,10 +0,0 @@ - -enable_language(C) - -add_library(recursion SHARED empty.c) -set_property (TARGET recursion PROPERTY CUSTOM_PROPERTY1 "$<GENEX_EVAL:$<TARGET_PROPERTY:CUSTOM_PROPERTY2>>") -set_property (TARGET recursion PROPERTY CUSTOM_PROPERTY2 "$<GENEX_EVAL:$<TARGET_PROPERTY:CUSTOM_PROPERTY1>>") - -add_custom_target (drive - COMMAND echo "$<TARGET_GENEX_EVAL:recursion,$<TARGET_PROPERTY:recursion,CUSTOM_PROPERTY1>>" - DEPENDS recursion) diff --git a/Tests/RunCMake/GeneratorExpression/GENEX_EVAL.cmake b/Tests/RunCMake/GeneratorExpression/GENEX_EVAL.cmake deleted file mode 100644 index 153cd17..0000000 --- a/Tests/RunCMake/GeneratorExpression/GENEX_EVAL.cmake +++ /dev/null @@ -1,12 +0,0 @@ - -cmake_policy(VERSION 3.11) - -enable_language(C) - -add_library (example SHARED empty.c) -set_property (TARGET example PROPERTY CUSTOM_PROPERTY1 "PROPERTY1") -set_property (TARGET example PROPERTY CUSTOM_PROPERTY2 "$<TARGET_PROPERTY:CUSTOM_PROPERTY1>") -set_property (TARGET example PROPERTY CUSTOM_PROPERTY3 "$<GENEX_EVAL:BEFORE_$<TARGET_PROPERTY:CUSTOM_PROPERTY2>_AFTER>") -set_property (TARGET example PROPERTY CUSTOM_PROPERTY4 "$<GENEX_EVAL:$<TARGET_PROPERTY:CUSTOM_PROPERTY3>>") - -file(GENERATE OUTPUT "GENEX_EVAL-generated.txt" CONTENT "$<TARGET_GENEX_EVAL:example,$<TARGET_PROPERTY:example,CUSTOM_PROPERTY4>>") diff --git a/Tests/RunCMake/GeneratorExpression/RunCMakeTest.cmake b/Tests/RunCMake/GeneratorExpression/RunCMakeTest.cmake index 927005e..0278cf6 100644 --- a/Tests/RunCMake/GeneratorExpression/RunCMakeTest.cmake +++ b/Tests/RunCMake/GeneratorExpression/RunCMakeTest.cmake @@ -34,15 +34,6 @@ run_cmake(TARGET_NAME_IF_EXISTS-no-arg) run_cmake(TARGET_NAME_IF_EXISTS-empty-arg) run_cmake(TARGET_NAME_IF_EXISTS) run_cmake(TARGET_NAME_IF_EXISTS-not-a-target) -run_cmake(TARGET_GENEX_EVAL-no-arg) -run_cmake(TARGET_GENEX_EVAL-no-target) -run_cmake(TARGET_GENEX_EVAL-non-valid-target) -run_cmake(TARGET_GENEX_EVAL-recursion1) -run_cmake(TARGET_GENEX_EVAL-recursion2) -run_cmake(TARGET_GENEX_EVAL) -run_cmake(GENEX_EVAL-recursion1) -run_cmake(GENEX_EVAL-recursion2) -run_cmake(GENEX_EVAL) run_cmake(REMOVE_DUPLICATES-empty) run_cmake(REMOVE_DUPLICATES-1) run_cmake(REMOVE_DUPLICATES-2) diff --git a/Tests/RunCMake/GeneratorExpression/TARGET_GENEX_EVAL-check.cmake b/Tests/RunCMake/GeneratorExpression/TARGET_GENEX_EVAL-check.cmake deleted file mode 100644 index 124a583..0000000 --- a/Tests/RunCMake/GeneratorExpression/TARGET_GENEX_EVAL-check.cmake +++ /dev/null @@ -1,6 +0,0 @@ -file(READ "${RunCMake_TEST_BINARY_DIR}/TARGET_GENEX_EVAL-generated.txt" content) - -set(expected "BEFORE_PROPERTY1_AFTER") -if(NOT content STREQUAL expected) - set(RunCMake_TEST_FAILED "actual content:\n [[${content}]]\nbut expected:\n [[${expected}]]") -endif() diff --git a/Tests/RunCMake/GeneratorExpression/TARGET_GENEX_EVAL-no-arg-result.txt b/Tests/RunCMake/GeneratorExpression/TARGET_GENEX_EVAL-no-arg-result.txt deleted file mode 100644 index d00491f..0000000 --- a/Tests/RunCMake/GeneratorExpression/TARGET_GENEX_EVAL-no-arg-result.txt +++ /dev/null @@ -1 +0,0 @@ -1 diff --git a/Tests/RunCMake/GeneratorExpression/TARGET_GENEX_EVAL-no-arg-stderr.txt b/Tests/RunCMake/GeneratorExpression/TARGET_GENEX_EVAL-no-arg-stderr.txt deleted file mode 100644 index 9b0844f..0000000 --- a/Tests/RunCMake/GeneratorExpression/TARGET_GENEX_EVAL-no-arg-stderr.txt +++ /dev/null @@ -1,9 +0,0 @@ -^CMake Error at TARGET_GENEX_EVAL-no-arg.cmake:4 \(add_custom_command\): - Error evaluating generator expression: - - \$<TARGET_GENEX_EVAL:> - - \$<TARGET_GENEX_EVAL> expression requires 2 comma separated parameters, but - got 1 instead. -Call Stack \(most recent call first\): - CMakeLists.txt:3 \(include\) diff --git a/Tests/RunCMake/GeneratorExpression/TARGET_GENEX_EVAL-no-arg.cmake b/Tests/RunCMake/GeneratorExpression/TARGET_GENEX_EVAL-no-arg.cmake deleted file mode 100644 index 2dc13ea..0000000 --- a/Tests/RunCMake/GeneratorExpression/TARGET_GENEX_EVAL-no-arg.cmake +++ /dev/null @@ -1,7 +0,0 @@ - -cmake_policy(VERSION 3.11) - -add_custom_command(OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/copied_file.c" - COMMAND "${CMAKE_COMMAND}" -E copy "${CMAKE_CURRENT_SOURCE_DIR}/empty.c" "${CMAKE_CURRENT_BINARY_DIR}/copied_file$<TARGET_GENEX_EVAL:>.c" -) -add_custom_target(drive DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/copied_file.c") diff --git a/Tests/RunCMake/GeneratorExpression/TARGET_GENEX_EVAL-no-target-result.txt b/Tests/RunCMake/GeneratorExpression/TARGET_GENEX_EVAL-no-target-result.txt deleted file mode 100644 index d00491f..0000000 --- a/Tests/RunCMake/GeneratorExpression/TARGET_GENEX_EVAL-no-target-result.txt +++ /dev/null @@ -1 +0,0 @@ -1 diff --git a/Tests/RunCMake/GeneratorExpression/TARGET_GENEX_EVAL-no-target-stderr.txt b/Tests/RunCMake/GeneratorExpression/TARGET_GENEX_EVAL-no-target-stderr.txt deleted file mode 100644 index 647fd85..0000000 --- a/Tests/RunCMake/GeneratorExpression/TARGET_GENEX_EVAL-no-target-stderr.txt +++ /dev/null @@ -1,9 +0,0 @@ -^CMake Error at TARGET_GENEX_EVAL-no-target.cmake:2 \(add_custom_command\): - Error evaluating generator expression: - - \$<TARGET_GENEX_EVAL:,> - - \$<TARGET_GENEX_EVAL:tgt, ...> expression requires a non-empty valid target - name. -Call Stack \(most recent call first\): - CMakeLists.txt:3 \(include\) diff --git a/Tests/RunCMake/GeneratorExpression/TARGET_GENEX_EVAL-no-target.cmake b/Tests/RunCMake/GeneratorExpression/TARGET_GENEX_EVAL-no-target.cmake deleted file mode 100644 index df4f0ea..0000000 --- a/Tests/RunCMake/GeneratorExpression/TARGET_GENEX_EVAL-no-target.cmake +++ /dev/null @@ -1,5 +0,0 @@ - -add_custom_command(OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/copied_file.c" - COMMAND "${CMAKE_COMMAND}" -E copy "${CMAKE_CURRENT_SOURCE_DIR}/empty.c" "${CMAKE_CURRENT_BINARY_DIR}/copied_file$<TARGET_GENEX_EVAL:,>.c" -) -add_custom_target(drive DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/copied_file.c") diff --git a/Tests/RunCMake/GeneratorExpression/TARGET_GENEX_EVAL-non-valid-target-result.txt b/Tests/RunCMake/GeneratorExpression/TARGET_GENEX_EVAL-non-valid-target-result.txt deleted file mode 100644 index d00491f..0000000 --- a/Tests/RunCMake/GeneratorExpression/TARGET_GENEX_EVAL-non-valid-target-result.txt +++ /dev/null @@ -1 +0,0 @@ -1 diff --git a/Tests/RunCMake/GeneratorExpression/TARGET_GENEX_EVAL-non-valid-target-stderr.txt b/Tests/RunCMake/GeneratorExpression/TARGET_GENEX_EVAL-non-valid-target-stderr.txt deleted file mode 100644 index cc44d4b..0000000 --- a/Tests/RunCMake/GeneratorExpression/TARGET_GENEX_EVAL-non-valid-target-stderr.txt +++ /dev/null @@ -1,8 +0,0 @@ -^CMake Error at TARGET_GENEX_EVAL-non-valid-target.cmake:2 \(add_custom_command\): - Error evaluating generator expression: - - \$<TARGET_GENEX_EVAL:bad-target,> - - \$<TARGET_GENEX_EVAL:tgt, ...> target "bad-target" not found. -Call Stack \(most recent call first\): - CMakeLists.txt:3 \(include\) diff --git a/Tests/RunCMake/GeneratorExpression/TARGET_GENEX_EVAL-non-valid-target.cmake b/Tests/RunCMake/GeneratorExpression/TARGET_GENEX_EVAL-non-valid-target.cmake deleted file mode 100644 index 8db7375..0000000 --- a/Tests/RunCMake/GeneratorExpression/TARGET_GENEX_EVAL-non-valid-target.cmake +++ /dev/null @@ -1,5 +0,0 @@ - -add_custom_command(OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/copied_file.c" - COMMAND "${CMAKE_COMMAND}" -E copy "${CMAKE_CURRENT_SOURCE_DIR}/empty.c" "${CMAKE_CURRENT_BINARY_DIR}/copied_file$<TARGET_GENEX_EVAL:bad-target,>.c" -) -add_custom_target(drive DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/copied_file.c") diff --git a/Tests/RunCMake/GeneratorExpression/TARGET_GENEX_EVAL-recursion1-result.txt b/Tests/RunCMake/GeneratorExpression/TARGET_GENEX_EVAL-recursion1-result.txt deleted file mode 100644 index d00491f..0000000 --- a/Tests/RunCMake/GeneratorExpression/TARGET_GENEX_EVAL-recursion1-result.txt +++ /dev/null @@ -1 +0,0 @@ -1 diff --git a/Tests/RunCMake/GeneratorExpression/TARGET_GENEX_EVAL-recursion1-stderr.txt b/Tests/RunCMake/GeneratorExpression/TARGET_GENEX_EVAL-recursion1-stderr.txt deleted file mode 100644 index bba2234..0000000 --- a/Tests/RunCMake/GeneratorExpression/TARGET_GENEX_EVAL-recursion1-stderr.txt +++ /dev/null @@ -1,9 +0,0 @@ -^CMake Error at TARGET_GENEX_EVAL-recursion1.cmake:7 \(add_custom_target\): - Error evaluating generator expression: - - \$<TARGET_GENEX_EVAL:recursion,\$<TARGET_PROPERTY:CUSTOM_PROPERTY>> - - Self reference on target "recursion". - -Call Stack \(most recent call first\): - CMakeLists.txt:3 \(include\) diff --git a/Tests/RunCMake/GeneratorExpression/TARGET_GENEX_EVAL-recursion1.cmake b/Tests/RunCMake/GeneratorExpression/TARGET_GENEX_EVAL-recursion1.cmake deleted file mode 100644 index b75d211..0000000 --- a/Tests/RunCMake/GeneratorExpression/TARGET_GENEX_EVAL-recursion1.cmake +++ /dev/null @@ -1,9 +0,0 @@ - -enable_language(C) - -add_library (recursion SHARED empty.c) -set_property (TARGET recursion PROPERTY CUSTOM_PROPERTY "$<TARGET_GENEX_EVAL:recursion,$<TARGET_PROPERTY:CUSTOM_PROPERTY>>") - -add_custom_target (drive - COMMAND echo "$<TARGET_GENEX_EVAL:recursion,$<TARGET_PROPERTY:recursion,CUSTOM_PROPERTY>>" - DEPENDS recursion) diff --git a/Tests/RunCMake/GeneratorExpression/TARGET_GENEX_EVAL-recursion2-result.txt b/Tests/RunCMake/GeneratorExpression/TARGET_GENEX_EVAL-recursion2-result.txt deleted file mode 100644 index d00491f..0000000 --- a/Tests/RunCMake/GeneratorExpression/TARGET_GENEX_EVAL-recursion2-result.txt +++ /dev/null @@ -1 +0,0 @@ -1 diff --git a/Tests/RunCMake/GeneratorExpression/TARGET_GENEX_EVAL-recursion2-stderr.txt b/Tests/RunCMake/GeneratorExpression/TARGET_GENEX_EVAL-recursion2-stderr.txt deleted file mode 100644 index 73f6b77..0000000 --- a/Tests/RunCMake/GeneratorExpression/TARGET_GENEX_EVAL-recursion2-stderr.txt +++ /dev/null @@ -1,26 +0,0 @@ -^CMake Error at TARGET_GENEX_EVAL-recursion2.cmake:10 \(add_custom_target\): - Error evaluating generator expression: - - \$<TARGET_GENEX_EVAL:recursion1,\$<TARGET_PROPERTY:recursion1,CUSTOM_PROPERTY1>> - - Dependency loop found. -Call Stack \(most recent call first\): - CMakeLists.txt:3 \(include\) - - -CMake Error at TARGET_GENEX_EVAL-recursion2.cmake:10 \(add_custom_target\): - Loop step 1 - - \$<TARGET_GENEX_EVAL:recursion2,\$<TARGET_PROPERTY:recursion2,CUSTOM_PROPERTY2>> - -Call Stack \(most recent call first\): - CMakeLists.txt:3 \(include\) - - -CMake Error at TARGET_GENEX_EVAL-recursion2.cmake:10 \(add_custom_target\): - Loop step 2 - - \$<TARGET_GENEX_EVAL:recursion1,\$<TARGET_PROPERTY:recursion1,CUSTOM_PROPERTY1>> - -Call Stack \(most recent call first\): - CMakeLists.txt:3 \(include\) diff --git a/Tests/RunCMake/GeneratorExpression/TARGET_GENEX_EVAL-recursion2.cmake b/Tests/RunCMake/GeneratorExpression/TARGET_GENEX_EVAL-recursion2.cmake deleted file mode 100644 index a28dfc3..0000000 --- a/Tests/RunCMake/GeneratorExpression/TARGET_GENEX_EVAL-recursion2.cmake +++ /dev/null @@ -1,12 +0,0 @@ - -enable_language(C) - -add_library (recursion1 SHARED empty.c) -set_property (TARGET recursion1 PROPERTY CUSTOM_PROPERTY1 "$<TARGET_GENEX_EVAL:recursion2,$<TARGET_PROPERTY:recursion2,CUSTOM_PROPERTY2>>") - -add_library (recursion2 SHARED empty.c) -set_property (TARGET recursion2 PROPERTY CUSTOM_PROPERTY2 "$<TARGET_GENEX_EVAL:recursion1,$<TARGET_PROPERTY:recursion1,CUSTOM_PROPERTY1>>") - -add_custom_target (drive - COMMAND echo "$<TARGET_GENEX_EVAL:recursion1,$<TARGET_PROPERTY:recursion1,CUSTOM_PROPERTY1>>" - DEPENDS recursion) diff --git a/Tests/RunCMake/GeneratorExpression/TARGET_GENEX_EVAL.cmake b/Tests/RunCMake/GeneratorExpression/TARGET_GENEX_EVAL.cmake deleted file mode 100644 index 68b3712..0000000 --- a/Tests/RunCMake/GeneratorExpression/TARGET_GENEX_EVAL.cmake +++ /dev/null @@ -1,10 +0,0 @@ - -cmake_policy(VERSION 3.11) - -enable_language(C) - -add_library (example SHARED empty.c) -set_property (TARGET example PROPERTY CUSTOM_PROPERTY1 "PROPERTY1") -set_property (TARGET example PROPERTY CUSTOM_PROPERTY2 "BEFORE_$<TARGET_PROPERTY:CUSTOM_PROPERTY1>_AFTER") - -file(GENERATE OUTPUT "TARGET_GENEX_EVAL-generated.txt" CONTENT "$<TARGET_GENEX_EVAL:example,$<TARGET_PROPERTY:example,CUSTOM_PROPERTY2>>") |