summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2017-01-26 15:11:25 (GMT)
committerBrad King <brad.king@kitware.com>2017-01-26 15:11:25 (GMT)
commitd491172445dcd32547fbeb3598510455e8e44132 (patch)
treeb262f4c17ce01c78391a6e080a12cad299b167e5
parent1a2a9b0d08c7ba2af168856b1220d42ff9a80921 (diff)
downloadCMake-d491172445dcd32547fbeb3598510455e8e44132.zip
CMake-d491172445dcd32547fbeb3598510455e8e44132.tar.gz
CMake-d491172445dcd32547fbeb3598510455e8e44132.tar.bz2
Tests: Teach GeneratorExpression to cover spaces in include dirs
Add a space to the imported include directories used for the test. This works around funny quoted-`;` interpretation by Visual Studio.
-rw-r--r--Tests/GeneratorExpression/CMakeLists.txt4
-rw-r--r--Tests/GeneratorExpression/check-part3.cmake2
2 files changed, 3 insertions, 3 deletions
diff --git a/Tests/GeneratorExpression/CMakeLists.txt b/Tests/GeneratorExpression/CMakeLists.txt
index 8ecfdd9..dd86b6f 100644
--- a/Tests/GeneratorExpression/CMakeLists.txt
+++ b/Tests/GeneratorExpression/CMakeLists.txt
@@ -145,13 +145,13 @@ add_library(imported1 SHARED IMPORTED)
set_property(TARGET imported1 PROPERTY IMPORTED_LOCATION_RELEASE release_loc)
set_property(TARGET imported1 PROPERTY IMPORTED_LOCATION_DEBUG debug_loc)
set_property(TARGET imported1 PROPERTY IMPORTED_CONFIGURATIONS RELEASE DEBUG)
-set_property(TARGET imported1 PROPERTY INTERFACE_INCLUDE_DIRECTORIES /imported1/include)
+set_property(TARGET imported1 PROPERTY INTERFACE_INCLUDE_DIRECTORIES "/imported1/include/with space")
add_library(imported2 SHARED IMPORTED)
set_property(TARGET imported2 PROPERTY IMPORTED_LOCATION_RELEASE release_loc)
set_property(TARGET imported2 PROPERTY IMPORTED_LOCATION_DEBUG debug_loc)
set_property(TARGET imported2 PROPERTY IMPORTED_CONFIGURATIONS RELEASE DEBUG)
-set_property(TARGET imported2 PROPERTY INTERFACE_INCLUDE_DIRECTORIES /imported2/include)
+set_property(TARGET imported2 PROPERTY INTERFACE_INCLUDE_DIRECTORIES "/imported2/include/with space")
add_library(imported3 SHARED IMPORTED)
set_property(TARGET imported3 PROPERTY IMPORTED_LOCATION_RELEASE release_loc)
diff --git a/Tests/GeneratorExpression/check-part3.cmake b/Tests/GeneratorExpression/check-part3.cmake
index 927ead4..57abbcc 100644
--- a/Tests/GeneratorExpression/check-part3.cmake
+++ b/Tests/GeneratorExpression/check-part3.cmake
@@ -9,7 +9,7 @@ check(test_version_equal_1 "0")
check(test_version_equal_2 "1")
if(config AND NOT config STREQUAL NoConfig)
- if(NOT "${test_imported_includes}" MATCHES "^;*/imported[12]/include;*$")
+ if(NOT "${test_imported_includes}" MATCHES "^;*/imported[12]/include/with space;*$")
message(SEND_ERROR "test_imported_includes is not correct: ${test_imported_includes}")
endif()
else()