diff options
| author | Brad King <brad.king@kitware.com> | 2020-06-30 18:40:53 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2020-06-30 18:41:00 (GMT) |
| commit | 6155077e1f5365b041366e719f029754323402d5 (patch) | |
| tree | 5b6ae65cce0414593ef6c34f96251950c887255c | |
| parent | 77ba7539adb805b154b778046eda491b40acf09e (diff) | |
| parent | b67eb656882c4e9e45878bfbac3bab2086fff8b8 (diff) | |
| download | CMake-6155077e1f5365b041366e719f029754323402d5.zip CMake-6155077e1f5365b041366e719f029754323402d5.tar.gz CMake-6155077e1f5365b041366e719f029754323402d5.tar.bz2 | |
Merge topic 'fileapi-version-doc'
b67eb65688 Help: Update FileAPI codemodel version to 2.2, add release notes
849178c9d0 Merge branch 'master' into fileapi-version-doc
e9be17ab42 Help: Update FileAPI codemodel version to 2.1, add release notes
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4956
| -rw-r--r-- | Help/manual/cmake-file-api.7.rst | 6 | ||||
| -rw-r--r-- | Help/release/3.18.rst | 6 | ||||
| -rw-r--r-- | Help/release/dev/fileapi-codemodel-2.2.rst | 7 |
3 files changed, 18 insertions, 1 deletions
diff --git a/Help/manual/cmake-file-api.7.rst b/Help/manual/cmake-file-api.7.rst index b54859c..34edc56 100644 --- a/Help/manual/cmake-file-api.7.rst +++ b/Help/manual/cmake-file-api.7.rst @@ -425,7 +425,7 @@ Version 1 does not exist to avoid confusion with that from { "kind": "codemodel", - "version": { "major": 2, "minor": 0 }, + "version": { "major": 2, "minor": 2 }, "paths": { "source": "/path/to/top-level-source-dir", "build": "/path/to/top-level-build-dir" @@ -887,6 +887,8 @@ with members: ``standard`` String representing the language standard. + This field was added in codemodel version 2.2. + ``compileCommandFragments`` Optional member that is present when fragments of the compiler command line invocation are available. The value is a JSON array of entries @@ -933,6 +935,8 @@ with members: unsigned integer 0-based index into the ``backtraceGraph`` member's ``nodes`` array. + This field was added in codemodel version 2.1. + ``defines`` Optional member that is present when there are preprocessor definitions. The value is a JSON array with an entry for each definition. Each diff --git a/Help/release/3.18.rst b/Help/release/3.18.rst index ef4fa30..386b61b 100644 --- a/Help/release/3.18.rst +++ b/Help/release/3.18.rst @@ -312,3 +312,9 @@ Other Changes network communication via ``http(s)``, such as :command:`file(DOWNLOAD)`, :command:`file(UPLOAD)`, and :command:`ctest_submit`. The precompiled binaries provided on ``cmake.org`` now support HTTP/2. + +* The :manual:`cmake-file-api(7)` "codemodel" version 2 ``version`` field has + been updated to 2.1. + +* The :manual:`cmake-file-api(7)` "codemodel" version 2 "target" object gained + a new ``precompileHeaders`` field in the ``compileGroups`` objects. diff --git a/Help/release/dev/fileapi-codemodel-2.2.rst b/Help/release/dev/fileapi-codemodel-2.2.rst new file mode 100644 index 0000000..5954df6 --- /dev/null +++ b/Help/release/dev/fileapi-codemodel-2.2.rst @@ -0,0 +1,7 @@ +fileapi-codemodel-2.2 +--------------------- + +* The :manual:`cmake-file-api(7)` "codemodel" version 2 ``version`` field has + been updated to 2.2. +* The :manual:`cmake-file-api(7)` "codemodel" version 2 "target" object gained + a new ``languageStandard`` field in the ``compileGroups`` objects. |