summaryrefslogtreecommitdiffstats
path: root/Tests/GeneratorExpression
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2017-01-26 15:13:14 (GMT)
committerBrad King <brad.king@kitware.com>2017-01-26 15:16:08 (GMT)
commitc3a22518f83dfe8e1787e93f05398a5263cc781a (patch)
tree3fbc1ca072bca16def0bbbf883102db9155ef34c /Tests/GeneratorExpression
parentd491172445dcd32547fbeb3598510455e8e44132 (diff)
downloadCMake-c3a22518f83dfe8e1787e93f05398a5263cc781a.zip
CMake-c3a22518f83dfe8e1787e93f05398a5263cc781a.tar.gz
CMake-c3a22518f83dfe8e1787e93f05398a5263cc781a.tar.bz2
Tests: Extend GeneratorExpression to work with more configurations
Add missing pieces for RelWithDebInfo and MinSizeRel.
Diffstat (limited to 'Tests/GeneratorExpression')
-rw-r--r--Tests/GeneratorExpression/CMakeLists.txt4
-rw-r--r--Tests/GeneratorExpression/check-part3.cmake2
2 files changed, 5 insertions, 1 deletions
diff --git a/Tests/GeneratorExpression/CMakeLists.txt b/Tests/GeneratorExpression/CMakeLists.txt
index dd86b6f..3091780 100644
--- a/Tests/GeneratorExpression/CMakeLists.txt
+++ b/Tests/GeneratorExpression/CMakeLists.txt
@@ -161,6 +161,10 @@ set_property(TARGET imported3 APPEND PROPERTY
INTERFACE_INCLUDE_DIRECTORIES $<$<CONFIG:DEBUG>:$<TARGET_PROPERTY:imported1,INTERFACE_INCLUDE_DIRECTORIES>>)
set_property(TARGET imported3 APPEND PROPERTY
INTERFACE_INCLUDE_DIRECTORIES $<$<CONFIG:RELEASE>:$<TARGET_PROPERTY:imported2,INTERFACE_INCLUDE_DIRECTORIES>>)
+set_property(TARGET imported3 APPEND PROPERTY
+ INTERFACE_INCLUDE_DIRECTORIES $<$<CONFIG:RELWITHDEBINFO>:$<TARGET_PROPERTY:imported2,INTERFACE_INCLUDE_DIRECTORIES>>)
+set_property(TARGET imported3 APPEND PROPERTY
+ INTERFACE_INCLUDE_DIRECTORIES $<$<CONFIG:MINSIZEREL>:$<TARGET_PROPERTY:imported2,INTERFACE_INCLUDE_DIRECTORIES>>)
add_library(imported4 SHARED IMPORTED)
set_property(TARGET imported4 APPEND PROPERTY
diff --git a/Tests/GeneratorExpression/check-part3.cmake b/Tests/GeneratorExpression/check-part3.cmake
index 57abbcc..9014406 100644
--- a/Tests/GeneratorExpression/check-part3.cmake
+++ b/Tests/GeneratorExpression/check-part3.cmake
@@ -13,7 +13,7 @@ if(config AND NOT config STREQUAL NoConfig)
message(SEND_ERROR "test_imported_includes is not correct: ${test_imported_includes}")
endif()
else()
- if(NOT "${test_imported_includes}" MATCHES "^;$")
+ if(NOT "${test_imported_includes}" MATCHES "^;;;$")
message(SEND_ERROR "test_imported_includes is not an empty list: ${test_imported_includes}")
endif()
endif()