diff options
| author | Brad King <brad.king@kitware.com> | 2022-09-14 12:01:34 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2022-09-14 12:01:52 (GMT) |
| commit | 64b80f54f0205f9b040971eea114508ab52bfdbf (patch) | |
| tree | 7649a33cd69f0c81093bfe39baed5190bbc6c2a1 | |
| parent | 0a9ce1ec3cf34b9098c5c2726956c0bd5191151b (diff) | |
| parent | 3546657cc772ea4e8ce8d5240a447623fe2bf48a (diff) | |
| download | CMake-64b80f54f0205f9b040971eea114508ab52bfdbf.zip CMake-64b80f54f0205f9b040971eea114508ab52bfdbf.tar.gz CMake-64b80f54f0205f9b040971eea114508ab52bfdbf.tar.bz2 | |
Merge topic 'cmake-presets-package-unsupported-error'
3546657cc7 CMakePresets.json: Fix error message for unsupported package presets
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !7669
| -rw-r--r-- | Source/cmCMakePresetsGraph.cxx | 2 | ||||
| -rw-r--r-- | Tests/RunCMake/CMakePresetsPackage/UnsupportedVersion-configure-x-stderr.txt | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Source/cmCMakePresetsGraph.cxx b/Source/cmCMakePresetsGraph.cxx index c168a45..5b216bb 100644 --- a/Source/cmCMakePresetsGraph.cxx +++ b/Source/cmCMakePresetsGraph.cxx @@ -1115,7 +1115,7 @@ const char* cmCMakePresetsGraph::ResultToString(ReadFileResult result) return "File version must be 2 or higher for build and test preset " "support."; case ReadFileResult::PACKAGE_PRESETS_UNSUPPORTED: - return "File version must be 5 or higher for package preset support"; + return "File version must be 6 or higher for package preset support"; case ReadFileResult::INCLUDE_UNSUPPORTED: return "File version must be 4 or higher for include support"; case ReadFileResult::INVALID_INCLUDE: diff --git a/Tests/RunCMake/CMakePresetsPackage/UnsupportedVersion-configure-x-stderr.txt b/Tests/RunCMake/CMakePresetsPackage/UnsupportedVersion-configure-x-stderr.txt index 325af70..4c461e3 100644 --- a/Tests/RunCMake/CMakePresetsPackage/UnsupportedVersion-configure-x-stderr.txt +++ b/Tests/RunCMake/CMakePresetsPackage/UnsupportedVersion-configure-x-stderr.txt @@ -1,2 +1,2 @@ ^CMake Error: Could not read presets from [^ -]*/Tests/RunCMake/CMakePresetsPackage/UnsupportedVersion: File version must be 5 or higher for package preset support$ +]*/Tests/RunCMake/CMakePresetsPackage/UnsupportedVersion: File version must be 6 or higher for package preset support$ |