summaryrefslogtreecommitdiffstats
path: root/Tests/RunCMake
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2022-01-20 16:55:22 (GMT)
committerKitware Robot <kwrobot@kitware.com>2022-01-20 16:55:35 (GMT)
commita47b4387b40047f9b9e0cf5f7dbe7c1fe056355e (patch)
tree0b350e2c1dc8e0dd16aa9cdfad67c628ba421368 /Tests/RunCMake
parent410dd6cf611f31ebca74e1db4dc439e6fcaf34b4 (diff)
parent0c2d234bc9be8fbdad5b14d3d5e66026a5d6e2fc (diff)
downloadCMake-a47b4387b40047f9b9e0cf5f7dbe7c1fe056355e.zip
CMake-a47b4387b40047f9b9e0cf5f7dbe7c1fe056355e.tar.gz
CMake-a47b4387b40047f9b9e0cf5f7dbe7c1fe056355e.tar.bz2
Merge topic 'cmake-presets-include-outside-project-dir'
0c2d234bc9 CMakePresets: Allow files included from CMakePresets.json to be anywhere Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Gerhard Olsson <gerhard.nospam@gmail.com> Merge-request: !6867
Diffstat (limited to 'Tests/RunCMake')
-rw-r--r--Tests/RunCMake/CMakePresets/IncludeOutsideProject-result.txt1
-rw-r--r--Tests/RunCMake/CMakePresets/IncludeOutsideProject-stderr.txt2
-rw-r--r--Tests/RunCMake/CMakePresets/IncludeOutsideProject.cmake0
3 files changed, 0 insertions, 3 deletions
diff --git a/Tests/RunCMake/CMakePresets/IncludeOutsideProject-result.txt b/Tests/RunCMake/CMakePresets/IncludeOutsideProject-result.txt
deleted file mode 100644
index d00491f..0000000
--- a/Tests/RunCMake/CMakePresets/IncludeOutsideProject-result.txt
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/Tests/RunCMake/CMakePresets/IncludeOutsideProject-stderr.txt b/Tests/RunCMake/CMakePresets/IncludeOutsideProject-stderr.txt
deleted file mode 100644
index 2aa3f59..0000000
--- a/Tests/RunCMake/CMakePresets/IncludeOutsideProject-stderr.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-^CMake Error: Could not read presets from [^
-]*/Tests/RunCMake/CMakePresets/IncludeOutsideProject: File included from outside project directory$
diff --git a/Tests/RunCMake/CMakePresets/IncludeOutsideProject.cmake b/Tests/RunCMake/CMakePresets/IncludeOutsideProject.cmake
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/Tests/RunCMake/CMakePresets/IncludeOutsideProject.cmake