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 | bf0fd71ad10f1f6956d58926cd31843883847b8e (patch) | |
| tree | 76d54676c477fb46dfe5c5952e6c46bddd337aec /Help/manual | |
| parent | 4b27a80cbc509825394ef57576c96b81a6aa4539 (diff) | |
| parent | 06e16ea008bf6efbe68028279539cfc6d1ff7a93 (diff) | |
| download | CMake-bf0fd71ad10f1f6956d58926cd31843883847b8e.zip CMake-bf0fd71ad10f1f6956d58926cd31843883847b8e.tar.gz CMake-bf0fd71ad10f1f6956d58926cd31843883847b8e.tar.bz2 | |
Merge topic 'preset-no-comments'
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 'Help/manual')
| -rw-r--r-- | Help/manual/cmake-presets.7.rst | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/Help/manual/cmake-presets.7.rst b/Help/manual/cmake-presets.7.rst index 55a9947..467818d 100644 --- a/Help/manual/cmake-presets.7.rst +++ b/Help/manual/cmake-presets.7.rst @@ -29,10 +29,7 @@ is using Git, ``CMakePresets.json`` may be tracked, and Format ====== -The files are JSON documents. C-style comments are allowed using -line-wise ``//`` syntax or block ``/*...*/`` syntax. - -Each document has an object as the root: +The files are a JSON document with an object as the root: .. literalinclude:: presets/example.json :language: json |