diff options
| author | Martin Duffy <martin.duffy@kitware.com> | 2023-03-22 13:11:21 -0400 |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2023-03-29 10:41:19 -0400 |
| commit | 19305afd8a2a46925b1a880de68f7be0ad1f3091 (patch) | |
| tree | cdef4417cd852c2a5dd85886df4ff61d7fd2e653 /Source/CPack | |
| parent | 6b08358e17f5b85ad04ab512e4b6e39e989cea35 (diff) | |
| download | cmake-19305afd8a2a46925b1a880de68f7be0ad1f3091.tar.gz | |
presets: Improve JSON parser and error messages
Diffstat (limited to 'Source/CPack')
| -rw-r--r-- | Source/CPack/cpack.cxx | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/Source/CPack/cpack.cxx b/Source/CPack/cpack.cxx index 225711808c..234bc59352 100644 --- a/Source/CPack/cpack.cxx +++ b/Source/CPack/cpack.cxx @@ -28,6 +28,7 @@ #include "cmDocumentation.h" #include "cmDocumentationEntry.h" #include "cmGlobalGenerator.h" +#include "cmJSONState.h" #include "cmMakefile.h" #include "cmState.h" #include "cmStateSnapshot.h" @@ -265,11 +266,11 @@ int main(int argc, char const* const* argv) cmCMakePresetsGraph presetsGraph; auto result = presetsGraph.ReadProjectPresets(workingDirectory); - if (result != cmCMakePresetsGraph::ReadFileResult::READ_OK) { + if (result != true) { cmCPack_Log(&log, cmCPackLog::LOG_ERROR, "Could not read presets from " - << workingDirectory << ": " - << cmCMakePresetsGraph::ResultToString(result) << '\n'); + << workingDirectory << ":" + << presetsGraph.parseState.GetErrorMessage() << '\n'); return 1; } |