From 16a24b0ab00d9e0d4fabe96e518216053f8cd58b Mon Sep 17 00:00:00 2001 From: Kyle Edwards Date: Thu, 22 Sep 2022 16:14:01 -0400 Subject: Help: List packagePresets field in cmake-presets.7 --- Help/manual/cmake-presets.7.rst | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Help/manual/cmake-presets.7.rst b/Help/manual/cmake-presets.7.rst index d7acbef..d5319f2 100644 --- a/Help/manual/cmake-presets.7.rst +++ b/Help/manual/cmake-presets.7.rst @@ -102,6 +102,10 @@ The root object recognizes the following fields: An optional array of `Test Preset`_ objects. This is allowed in preset files specifying version ``2`` or above. +``packagePresets`` + An optional array of `Package Preset`_ objects. + This is allowed in preset files specifying version ``6`` or above. + Includes ^^^^^^^^ -- cgit v0.12 From e9093840627c6418d15b8278ec05ab2d3c9adea9 Mon Sep 17 00:00:00 2001 From: Kyle Edwards Date: Thu, 22 Sep 2022 16:24:38 -0400 Subject: Help: Add package preset to example presets file --- Help/manual/presets/example.json | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/Help/manual/presets/example.json b/Help/manual/presets/example.json index be5c791..06a1112 100644 --- a/Help/manual/presets/example.json +++ b/Help/manual/presets/example.json @@ -1,5 +1,5 @@ { - "version": 5, + "version": 6, "cmakeMinimumRequired": { "major": 3, "minor": 23, @@ -66,6 +66,15 @@ "execution": {"noTestsAction": "error", "stopOnFailure": true} } ], + "packagePresets": [ + { + "name": "default", + "configurePreset": "default", + "generators": [ + "TGZ" + ] + } + ], "vendor": { "example.com/ExampleIDE/1.0": { "autoFormat": false -- cgit v0.12 From 4328deb618c6f0f538964136ba00ca86edbed8eb Mon Sep 17 00:00:00 2001 From: Kyle Edwards Date: Fri, 23 Sep 2022 09:40:14 -0400 Subject: Tests: Add test for cpack --list-presets --- .../ListPresets-package-x-stdout.txt | 4 ++++ Tests/RunCMake/CMakePresetsPackage/ListPresets.cmake | 0 .../RunCMake/CMakePresetsPackage/ListPresets.json.in | 20 ++++++++++++++++++++ .../RunCMake/CMakePresetsPackage/RunCMakeTest.cmake | 1 + 4 files changed, 25 insertions(+) create mode 100644 Tests/RunCMake/CMakePresetsPackage/ListPresets-package-x-stdout.txt create mode 100644 Tests/RunCMake/CMakePresetsPackage/ListPresets.cmake create mode 100644 Tests/RunCMake/CMakePresetsPackage/ListPresets.json.in diff --git a/Tests/RunCMake/CMakePresetsPackage/ListPresets-package-x-stdout.txt b/Tests/RunCMake/CMakePresetsPackage/ListPresets-package-x-stdout.txt new file mode 100644 index 0000000..307ec0a --- /dev/null +++ b/Tests/RunCMake/CMakePresetsPackage/ListPresets-package-x-stdout.txt @@ -0,0 +1,4 @@ +^Available package presets: + + "default" + "with-description" - With Description$ diff --git a/Tests/RunCMake/CMakePresetsPackage/ListPresets.cmake b/Tests/RunCMake/CMakePresetsPackage/ListPresets.cmake new file mode 100644 index 0000000..e69de29 diff --git a/Tests/RunCMake/CMakePresetsPackage/ListPresets.json.in b/Tests/RunCMake/CMakePresetsPackage/ListPresets.json.in new file mode 100644 index 0000000..5f3cf48 --- /dev/null +++ b/Tests/RunCMake/CMakePresetsPackage/ListPresets.json.in @@ -0,0 +1,20 @@ +{ + "version": 6, + "configurePresets": [ + { + "name": "default" + } + ], + "packagePresets": [ + { + "name": "default", + "configurePreset": "default" + }, + { + "name": "with-description", + "displayName": "With Description", + "description": "This preset has a description", + "configurePreset": "default" + } + ] +} diff --git a/Tests/RunCMake/CMakePresetsPackage/RunCMakeTest.cmake b/Tests/RunCMake/CMakePresetsPackage/RunCMakeTest.cmake index 0d5def1..269fb6e 100644 --- a/Tests/RunCMake/CMakePresetsPackage/RunCMakeTest.cmake +++ b/Tests/RunCMake/CMakePresetsPackage/RunCMakeTest.cmake @@ -99,3 +99,4 @@ endfunction() run_cmake_package_presets(UnsupportedVersion "x" "" "") run_cmake_package_presets(Good "default" "build-default-debug" "no-environment;with-environment;generators;configurations;variables;config-file;debug;verbose;package-name;package-version;package-directory;vendor-name") +run_cmake_package_presets(ListPresets "default" "" "x" "--list-presets") -- cgit v0.12 From 33b1338a92bb8c83bee290975c11aa1d2d9ef559 Mon Sep 17 00:00:00 2001 From: Kyle Edwards Date: Fri, 23 Sep 2022 09:52:42 -0400 Subject: Tests: Add test for --list-presets=all --- .../DocumentationExampleListAllPresets-stdout.txt | 18 ++++++++++++++++++ Tests/RunCMake/CMakePresets/RunCMakeTest.cmake | 1 + 2 files changed, 19 insertions(+) create mode 100644 Tests/RunCMake/CMakePresets/DocumentationExampleListAllPresets-stdout.txt diff --git a/Tests/RunCMake/CMakePresets/DocumentationExampleListAllPresets-stdout.txt b/Tests/RunCMake/CMakePresets/DocumentationExampleListAllPresets-stdout.txt new file mode 100644 index 0000000..b1fcc28 --- /dev/null +++ b/Tests/RunCMake/CMakePresets/DocumentationExampleListAllPresets-stdout.txt @@ -0,0 +1,18 @@ +^Not searching for unused variables given on the command line\. +Available configure presets: + + "default" ?- Default Config + "ninja-multi" ?- Ninja Multi-Config( + "windows-only" - Windows-only configuration)? + +Available build presets: + + "default" + +Available test presets: + + "default" + +Available package presets: + + "default"$ diff --git a/Tests/RunCMake/CMakePresets/RunCMakeTest.cmake b/Tests/RunCMake/CMakePresets/RunCMakeTest.cmake index 4f57e2f..efa838e 100644 --- a/Tests/RunCMake/CMakePresets/RunCMakeTest.cmake +++ b/Tests/RunCMake/CMakePresets/RunCMakeTest.cmake @@ -408,4 +408,5 @@ set(CMakePresets_EXTRA_FILES "${RunCMake_SOURCE_DIR}/moreThings.json.in" ) run_cmake_presets(DocumentationExample --preset=default) +run_cmake_presets(DocumentationExampleListAllPresets --list-presets=all) unset(CMakePresets_EXTRA_FILES) -- cgit v0.12