diff options
| author | Brad King <brad.king@kitware.com> | 2012-11-06 19:13:10 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2012-11-06 19:13:10 (GMT) |
| commit | 11b8a44cfce1ad2383172760b9ac07a670b376fc (patch) | |
| tree | de8530b52bc256cecd039c7d390883b56568f798 /Tests | |
| parent | 43d3a6d49e402fa735022fd0720355a369df75fe (diff) | |
| parent | 9be64f34c299edfa69b126d419b4bd0619741656 (diff) | |
| download | CMake-11b8a44cfce1ad2383172760b9ac07a670b376fc.zip CMake-11b8a44cfce1ad2383172760b9ac07a670b376fc.tar.gz CMake-11b8a44cfce1ad2383172760b9ac07a670b376fc.tar.bz2 | |
Merge topic 'fix-genex-CONFIG'
9be64f3 GenEx: Use case insensitive comparison for $<CONFIG:...>
Diffstat (limited to 'Tests')
| -rw-r--r-- | Tests/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | Tests/GeneratorExpression/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | Tests/GeneratorExpression/check.cmake | 5 |
3 files changed, 10 insertions, 0 deletions
diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt index b404333..bbf804b 100644 --- a/Tests/CMakeLists.txt +++ b/Tests/CMakeLists.txt @@ -556,6 +556,7 @@ ${CMake_BINARY_DIR}/bin/cmake -DVERSION=master -P ${CMake_SOURCE_DIR}/Utilities/ --build-generator ${CMAKE_TEST_GENERATOR} --build-project GeneratorExpression --build-makeprogram ${CMAKE_TEST_MAKEPROGRAM} + --build-options -DCMAKE_BUILD_TYPE=\${CTEST_CONFIGURATION_TYPE} ) list(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/GeneratorExpression") diff --git a/Tests/GeneratorExpression/CMakeLists.txt b/Tests/GeneratorExpression/CMakeLists.txt index 581d483..3a92d81 100644 --- a/Tests/GeneratorExpression/CMakeLists.txt +++ b/Tests/GeneratorExpression/CMakeLists.txt @@ -19,6 +19,10 @@ add_custom_target(check ALL -Dtest_and_0_invalidcontent=$<AND:0,invalidcontent> -Dtest_config_0=$<CONFIG:$<CONFIGURATION>x> -Dtest_config_1=$<CONFIG:$<CONFIGURATION>> + -Dtest_config_debug=$<CONFIG:Debug>$<CONFIG:DEBUG>$<CONFIG:DeBuG> + -Dtest_config_release=$<CONFIG:Release>$<CONFIG:RELEASE>$<CONFIG:ReLeAsE> + -Dtest_config_relwithdebinfo=$<CONFIG:RelWithDebInfo>$<CONFIG:RELWITHDEBINFO>$<CONFIG:relwithdebinfo> + -Dtest_config_minsizerel=$<CONFIG:MinSizeRel>$<CONFIG:MINSIZEREL>$<CONFIG:minsizerel> -Dtest_not_0=$<NOT:0> -Dtest_not_1=$<NOT:1> -Dtest_or_0=$<OR:0> diff --git a/Tests/GeneratorExpression/check.cmake b/Tests/GeneratorExpression/check.cmake index 88a60ce..af436de 100644 --- a/Tests/GeneratorExpression/check.cmake +++ b/Tests/GeneratorExpression/check.cmake @@ -18,6 +18,11 @@ check(test_and_1_1 "1") check(test_and_0_invalidcontent "0") check(test_config_0 "0") check(test_config_1 "1") +foreach(c debug release relwithdebinfo minsizerel) + if(NOT "${test_config_${c}}" MATCHES "^(0+|1+)$") + message(SEND_ERROR "test_config_${c} is \"${test_config_${c}}\", not all 0 or all 1") + endif() +endforeach() check(test_not_0 "1") check(test_not_1 "0") check(test_or_0 "0") |