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 | 208b8a81ce3b61188214819090278e1b3437d609 (patch) | |
| tree | 6c796d9ba20e703b5ecd7aee735b7c8cc399eb88 /Help | |
| parent | 221fd892512036232c3a606df4770bdd3ae13375 (diff) | |
| parent | e9be17ab42a9e9999f1897e7f0da8604b605ed70 (diff) | |
| download | CMake-208b8a81ce3b61188214819090278e1b3437d609.zip CMake-208b8a81ce3b61188214819090278e1b3437d609.tar.gz CMake-208b8a81ce3b61188214819090278e1b3437d609.tar.bz2 | |
Merge topic 'fileapi-version-doc' into release-3.18
e9be17ab42 Help: Update FileAPI codemodel version to 2.1, add release notes
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4956
Diffstat (limited to 'Help')
| -rw-r--r-- | Help/manual/cmake-file-api.7.rst | 4 | ||||
| -rw-r--r-- | Help/release/3.18.rst | 6 |
2 files changed, 9 insertions, 1 deletions
diff --git a/Help/manual/cmake-file-api.7.rst b/Help/manual/cmake-file-api.7.rst index 91be31d..cc50952 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": 1 }, "paths": { "source": "/path/to/top-level-source-dir", "build": "/path/to/top-level-build-dir" @@ -915,6 +915,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. |