summaryrefslogtreecommitdiffstats
path: root/Tests/RunCMake
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2019-03-12 13:53:16 (GMT)
committerKitware Robot <kwrobot@kitware.com>2019-03-12 13:53:27 (GMT)
commit5822a7bed289100b78a502e449b436da2fe67af1 (patch)
tree920db69d6a17edf227348b8c9ecc95190d7a80d9 /Tests/RunCMake
parent7358f317e356dff8ef2c1cdd216b9e6063cd4d9a (diff)
parent463c2fba4eec7f364689a11b7c36afe966b1f151 (diff)
downloadCMake-5822a7bed289100b78a502e449b436da2fe67af1.zip
CMake-5822a7bed289100b78a502e449b436da2fe67af1.tar.gz
CMake-5822a7bed289100b78a502e449b436da2fe67af1.tar.bz2
Merge topic 'shell_path'
463c2fba4e Genex: Teach SHELL_PATH to support a list of paths 21da25d2a8 Tests: Generalize GeneratorExpression MSYS path conversion workaround Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3057
Diffstat (limited to 'Tests/RunCMake')
-rw-r--r--Tests/RunCMake/GeneratorExpression/BadSHELL_PATH-stderr.txt9
-rw-r--r--Tests/RunCMake/GeneratorExpression/BadSHELL_PATH.cmake1
2 files changed, 10 insertions, 0 deletions
diff --git a/Tests/RunCMake/GeneratorExpression/BadSHELL_PATH-stderr.txt b/Tests/RunCMake/GeneratorExpression/BadSHELL_PATH-stderr.txt
index 8d3c4cc..a08e7b2 100644
--- a/Tests/RunCMake/GeneratorExpression/BadSHELL_PATH-stderr.txt
+++ b/Tests/RunCMake/GeneratorExpression/BadSHELL_PATH-stderr.txt
@@ -15,3 +15,12 @@ CMake Error at BadSHELL_PATH.cmake:[0-9]+ \(add_custom_target\):
"Relative/Path" is not an absolute path.
Call Stack \(most recent call first\):
CMakeLists.txt:3 \(include\)
++
+CMake Error at BadSHELL_PATH.cmake:[0-9]+ \(add_custom_target\):
+ Error evaluating generator expression:
+
+ \$<SHELL_PATH:;>
+
+ "" is not an absolute path.
+Call Stack \(most recent call first\):
+ CMakeLists.txt:3 \(include\)
diff --git a/Tests/RunCMake/GeneratorExpression/BadSHELL_PATH.cmake b/Tests/RunCMake/GeneratorExpression/BadSHELL_PATH.cmake
index 5eff7bc..0e7c342 100644
--- a/Tests/RunCMake/GeneratorExpression/BadSHELL_PATH.cmake
+++ b/Tests/RunCMake/GeneratorExpression/BadSHELL_PATH.cmake
@@ -1,4 +1,5 @@
add_custom_target(check ALL COMMAND check
$<SHELL_PATH:>
$<SHELL_PATH:Relative/Path>
+ "$<SHELL_PATH:;>"
VERBATIM)