Merge branch 'release-3.26' into release-3.27

Help/manual/cmake-file-api.7.rst

@@ -1093,10 +1093,10 @@ with members:
     ``PRIVATE``, or ``INTERFACE``.
 
   ``baseDirectories``
-    A JSON array of strings specifying the base directories containing sources
-    in the file set.  If the file is inside the top-level source directory
-    then the path is specified relative to that directory.  Otherwise the path
-    is absolute.
+    A JSON array of strings, each specifying a base directory containing
+    sources in the file set.  If the directory is inside the top-level source
+    directory then the path is specified relative to that directory.
+    Otherwise the path is absolute.
 
   This field was added in codemodel version 2.5.
 

Help/release/3.26.rst

@@ -181,3 +181,13 @@ Changes made since CMake 3.26.0 include the following.
 * These versions made no changes to documented features or interfaces.
   Some implementation updates were made to support ecosystem changes
   and/or fix regressions.
+
+3.26.6
+------
+
+* The :manual:`cmake-file-api(7)` "codemodel" version 2 "target" object
+  ``fileSets`` field was introduced by CMake 3.26.0 with entries of its
+  ``baseDirectories`` member incorrectly expressed as absolute paths
+  even if they are inside the top-level source directory.  This has
+  been fixed.  Clients must be updated to expect relative paths under
+  the top-level source directory.