diff options
| author | Stephen Kelly <steveire@gmail.com> | 2012-10-15 22:22:18 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2012-10-17 20:21:13 (GMT) |
| commit | f7ef32b00b8d4fe74bfdcee3e690309e9a89e251 (patch) | |
| tree | 8e87f9b2b23e47d96b9c1fa8b6a0e81af2204742 /Tests/GeneratorExpression | |
| parent | fd59b10e7149026658d8dcdedfef0b3810fea226 (diff) | |
| download | CMake-f7ef32b00b8d4fe74bfdcee3e690309e9a89e251.zip CMake-f7ef32b00b8d4fe74bfdcee3e690309e9a89e251.tar.gz CMake-f7ef32b00b8d4fe74bfdcee3e690309e9a89e251.tar.bz2 | |
GenEx: Replace some failing tests with Borland and NMake makefiles.
The '<<' is a special sequence on those platforms, so it can't appear in
the test.
Diffstat (limited to 'Tests/GeneratorExpression')
| -rw-r--r-- | Tests/GeneratorExpression/CMakeLists.txt | 5 | ||||
| -rw-r--r-- | Tests/GeneratorExpression/check.cmake | 5 |
2 files changed, 4 insertions, 6 deletions
diff --git a/Tests/GeneratorExpression/CMakeLists.txt b/Tests/GeneratorExpression/CMakeLists.txt index cb01ec1..891fa11 100644 --- a/Tests/GeneratorExpression/CMakeLists.txt +++ b/Tests/GeneratorExpression/CMakeLists.txt @@ -62,15 +62,14 @@ add_custom_target(check ALL -Dtest_incomplete_11=$<something,, -Dtest_incomplete_12=$<,, -Dtest_incomplete_13=$<some$<1:special>thing - -Dtest_incomplete_14=$<<something + -Dtest_incomplete_14=$<$<ANGLE-R> -Dtest_incomplete_15=$<some$<thing - -Dtest_incomplete_16=$<<some$<thing + -Dtest_incomplete_16=$<BOOL:something -Dtest_incomplete_17=$<1:some$thing> -Dtest_incomplete_18=$<1:some,thing -Dtest_incomplete_19=$<1:some,thing$<ANGLE-R> -Dtest_incomplete_20=$<CONFIGURATION$<ANGLE-R> -Dtest_incomplete_21=$<BOOL:something$<ANGLE-R> - -Dtest_incomplete_22=$<BOOL:something -P ${CMAKE_CURRENT_SOURCE_DIR}/check.cmake COMMAND ${CMAKE_COMMAND} -E echo "check done" VERBATIM diff --git a/Tests/GeneratorExpression/check.cmake b/Tests/GeneratorExpression/check.cmake index bfdbd65..8ffa481 100644 --- a/Tests/GeneratorExpression/check.cmake +++ b/Tests/GeneratorExpression/check.cmake @@ -63,12 +63,11 @@ check(test_incomplete_10 "$<something:,:") check(test_incomplete_11 "$<something,,") check(test_incomplete_12 "$<,,") check(test_incomplete_13 "$<somespecialthing") -check(test_incomplete_14 "$<<something") +check(test_incomplete_14 "$<>") check(test_incomplete_15 "$<some$<thing") -check(test_incomplete_16 "$<<some$<thing") +check(test_incomplete_16 "$<BOOL:something") check(test_incomplete_17 "some$thing") check(test_incomplete_18 "$<1:some,thing") check(test_incomplete_19 "$<1:some,thing>") check(test_incomplete_20 "$<CONFIGURATION>") check(test_incomplete_21 "$<BOOL:something>") -check(test_incomplete_22 "$<BOOL:something") |