summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2023-11-27 18:48:12 (GMT)
committerBrad King <brad.king@kitware.com>2023-11-27 18:48:12 (GMT)
commitceb742a8fbadbda57bd288c1677a5d2dc791234f (patch)
tree792d1d24658169b476e01c89b1bb7b5e90ec00f4
parent569c1d1b6e1410fc9a742dad429d7b31ccddff2a (diff)
downloadCMake-ceb742a8fbadbda57bd288c1677a5d2dc791234f.zip
CMake-ceb742a8fbadbda57bd288c1677a5d2dc791234f.tar.gz
CMake-ceb742a8fbadbda57bd288c1677a5d2dc791234f.tar.bz2
CMake 3.26.6v3.26.6
-rw-r--r--Help/manual/cmake-file-api.7.rst8
-rw-r--r--Help/release/3.26.rst10
-rw-r--r--Source/CMakeVersion.cmake2
3 files changed, 15 insertions, 5 deletions
diff --git a/Help/manual/cmake-file-api.7.rst b/Help/manual/cmake-file-api.7.rst
index 878a174..ea87bb4 100644
--- a/Help/manual/cmake-file-api.7.rst
+++ b/Help/manual/cmake-file-api.7.rst
@@ -1087,10 +1087,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.
diff --git a/Help/release/3.26.rst b/Help/release/3.26.rst
index c73c59a..72ffad8 100644
--- a/Help/release/3.26.rst
+++ b/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.
diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake
index 92fe244..c815224 100644
--- a/Source/CMakeVersion.cmake
+++ b/Source/CMakeVersion.cmake
@@ -1,7 +1,7 @@
# CMake version number components.
set(CMake_VERSION_MAJOR 3)
set(CMake_VERSION_MINOR 26)
-set(CMake_VERSION_PATCH 5)
+set(CMake_VERSION_PATCH 6)
#set(CMake_VERSION_RC 0)
set(CMake_VERSION_IS_DIRTY 0)