summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKyle Edwards <kyle.edwards@kitware.com>2020-06-30 17:18:09 (GMT)
committerKyle Edwards <kyle.edwards@kitware.com>2020-06-30 18:04:13 (GMT)
commite9be17ab42a9e9999f1897e7f0da8604b605ed70 (patch)
tree6c796d9ba20e703b5ecd7aee735b7c8cc399eb88
parent221fd892512036232c3a606df4770bdd3ae13375 (diff)
downloadCMake-e9be17ab42a9e9999f1897e7f0da8604b605ed70.zip
CMake-e9be17ab42a9e9999f1897e7f0da8604b605ed70.tar.gz
CMake-e9be17ab42a9e9999f1897e7f0da8604b605ed70.tar.bz2
Help: Update FileAPI codemodel version to 2.1, add release notes
This fixes the documentation which should have been fixed in 9f6d40ee.
-rw-r--r--Help/manual/cmake-file-api.7.rst4
-rw-r--r--Help/release/3.18.rst6
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.