summaryrefslogtreecommitdiffstats
path: root/Tests/RunCMake
diff options
context:
space:
mode:
authorCraig Scott <craig.scott@crascit.com>2022-03-01 05:59:52 (GMT)
committerCraig Scott <craig.scott@crascit.com>2022-03-02 00:37:57 (GMT)
commit64047511760fa6ee459aa9d48b524f322623f89c (patch)
treeef57829eebd42fab68220d26186cce7995ceb11e /Tests/RunCMake
parent07a7772968a17e804fc7c450a0a3a00a7203410d (diff)
downloadCMake-64047511760fa6ee459aa9d48b524f322623f89c.zip
CMake-64047511760fa6ee459aa9d48b524f322623f89c.tar.gz
CMake-64047511760fa6ee459aa9d48b524f322623f89c.tar.bz2
Help: Improve wording and structure related to preset includes
Encourage placing preset includes near the beginning of a preset file and ensure the example shows that usage. Move the prose discussing includes to its own section to improve discoverability and break up paragraphs to make each main point harder to miss. Also clarify ${sourceDir} to remove any ambiguity with regard to its meaning in included files. Issue: #23214
Diffstat (limited to 'Tests/RunCMake')
-rw-r--r--Tests/RunCMake/CMakePresets/RunCMakeTest.cmake5
-rw-r--r--Tests/RunCMake/CMakePresets/moreThings.json.in3
-rw-r--r--Tests/RunCMake/CMakePresets/otherThings.json.in3
3 files changed, 11 insertions, 0 deletions
diff --git a/Tests/RunCMake/CMakePresets/RunCMakeTest.cmake b/Tests/RunCMake/CMakePresets/RunCMakeTest.cmake
index 51e786e..955cf53 100644
--- a/Tests/RunCMake/CMakePresets/RunCMakeTest.cmake
+++ b/Tests/RunCMake/CMakePresets/RunCMakeTest.cmake
@@ -372,4 +372,9 @@ if(CMAKE_HOST_WIN32)
endif()
file(WRITE "${RunCMake_BINARY_DIR}/example.json.in" "${_example}")
set(CMakePresets_FILE "${RunCMake_BINARY_DIR}/example.json.in")
+set(CMakePresets_EXTRA_FILES
+ "${RunCMake_SOURCE_DIR}/otherThings.json.in"
+ "${RunCMake_SOURCE_DIR}/moreThings.json.in"
+)
run_cmake_presets(DocumentationExample --preset=default)
+unset(CMakePresets_EXTRA_FILES)
diff --git a/Tests/RunCMake/CMakePresets/moreThings.json.in b/Tests/RunCMake/CMakePresets/moreThings.json.in
new file mode 100644
index 0000000..61a2092
--- /dev/null
+++ b/Tests/RunCMake/CMakePresets/moreThings.json.in
@@ -0,0 +1,3 @@
+{
+ "version": 1
+}
diff --git a/Tests/RunCMake/CMakePresets/otherThings.json.in b/Tests/RunCMake/CMakePresets/otherThings.json.in
new file mode 100644
index 0000000..61a2092
--- /dev/null
+++ b/Tests/RunCMake/CMakePresets/otherThings.json.in
@@ -0,0 +1,3 @@
+{
+ "version": 1
+}