summaryrefslogtreecommitdiffstats
path: root/Help/manual
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 /Help/manual
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 'Help/manual')
-rw-r--r--Help/manual/cmake-presets.7.rst7
1 files changed, 3 insertions, 4 deletions
diff --git a/Help/manual/cmake-presets.7.rst b/Help/manual/cmake-presets.7.rst
index 474e1aa..e702d97 100644
--- a/Help/manual/cmake-presets.7.rst
+++ b/Help/manual/cmake-presets.7.rst
@@ -37,10 +37,9 @@ a file may be included multiple times from the same file or from different
files. If ``CMakePresets.json`` and ``CMakeUserPresets.json`` are both present,
``CMakeUserPresets.json`` implicitly includes ``CMakePresets.json``, even with
no ``include`` field, in all versions of the format. Files directly or
-indirectly included from ``CMakePresets.json`` must be inside the project
-directory. This restriction does not apply to ``CMakeUserPresets.json`` and
-files that it includes, unless those files are also included by
-``CMakePresets.json``.
+indirectly included from ``CMakePresets.json`` should be guaranteed to be
+provided by the project. ``CMakeUserPresets.json`` may include files from
+anywhere.
Format
======