diff options
| author | Brad King <brad.king@kitware.com> | 2021-02-24 14:41:34 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2021-02-24 14:42:00 (GMT) |
| commit | 75d7329adbe5dc2099d2291135c56ebec7b39828 (patch) | |
| tree | 35c877a753d77b49e5828fc82d7a1c4bab15e29d /Source | |
| parent | cf21ea2ce6b174a69316a39e83616c056fc530e2 (diff) | |
| parent | 06e16ea008bf6efbe68028279539cfc6d1ff7a93 (diff) | |
| download | CMake-75d7329adbe5dc2099d2291135c56ebec7b39828.zip CMake-75d7329adbe5dc2099d2291135c56ebec7b39828.tar.gz CMake-75d7329adbe5dc2099d2291135c56ebec7b39828.tar.bz2 | |
Merge topic 'preset-no-comments' into release-3.20
06e16ea008 Merge branch 'backport-3.19-preset-no-comments' into preset-no-comments
afaa69f5b3 Tests: Remove comments from CMakePresetsTest/Good.json.in
4a92277f45 Revert "Help: Document JSON comment support in cmake-presets(7)"
431dd59b5e CMakePresets.json: Remove undocumented support for comments
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5853
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmCMakePresetsFile.cxx | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Source/cmCMakePresetsFile.cxx b/Source/cmCMakePresetsFile.cxx index 29d5325..c8d69b8 100644 --- a/Source/cmCMakePresetsFile.cxx +++ b/Source/cmCMakePresetsFile.cxx @@ -1519,6 +1519,7 @@ cmCMakePresetsFile::ReadFileResult cmCMakePresetsFile::ReadJSONFile( Json::Value root; Json::CharReaderBuilder builder; + Json::CharReaderBuilder::strictMode(&builder.settings_); if (!Json::parseFromStream(builder, fin, &root, nullptr)) { return ReadFileResult::JSON_PARSE_ERROR; } |