diff options
| author | Brad King <brad.king@kitware.com> | 2022-03-02 12:49:38 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2022-03-02 12:49:44 (GMT) |
| commit | f0f4390325aaf627fe100f9c53afb9087f68cbd1 (patch) | |
| tree | 52d30104db6c782453ca75d988d4685eb4560ee9 /Tests | |
| parent | 4b9227e718ed4244b44ee7e9d8c4a2d7bc9df653 (diff) | |
| parent | 64047511760fa6ee459aa9d48b524f322623f89c (diff) | |
| download | CMake-f0f4390325aaf627fe100f9c53afb9087f68cbd1.zip CMake-f0f4390325aaf627fe100f9c53afb9087f68cbd1.tar.gz CMake-f0f4390325aaf627fe100f9c53afb9087f68cbd1.tar.bz2 | |
Merge topic 'doc-presets-v4' into release-3.23
6404751176 Help: Improve wording and structure related to preset includes
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7028
Diffstat (limited to 'Tests')
| -rw-r--r-- | Tests/RunCMake/CMakePresets/RunCMakeTest.cmake | 5 | ||||
| -rw-r--r-- | Tests/RunCMake/CMakePresets/moreThings.json.in | 3 | ||||
| -rw-r--r-- | Tests/RunCMake/CMakePresets/otherThings.json.in | 3 |
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 +} |