diff options
| author | Brad King <brad.king@kitware.com> | 2023-11-27 19:30:37 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2023-11-27 19:30:37 (GMT) |
| commit | a4cfa9f017bf7f51f57ace77e83d392fc02391d4 (patch) | |
| tree | cc7bde55d05ae06ca92c9cbb0ca7a3fbd83a7a54 /Help | |
| parent | e332f7f666622d5dc2d1c4eda001c1e6b4b7bcfe (diff) | |
| parent | ceb742a8fbadbda57bd288c1677a5d2dc791234f (diff) | |
| download | CMake-a4cfa9f017bf7f51f57ace77e83d392fc02391d4.zip CMake-a4cfa9f017bf7f51f57ace77e83d392fc02391d4.tar.gz CMake-a4cfa9f017bf7f51f57ace77e83d392fc02391d4.tar.bz2 | |
Merge branch 'release-3.26' into release-3.27
Diffstat (limited to 'Help')
| -rw-r--r-- | Help/manual/cmake-file-api.7.rst | 8 | ||||
| -rw-r--r-- | Help/release/3.26.rst | 10 |
2 files changed, 14 insertions, 4 deletions
diff --git a/Help/manual/cmake-file-api.7.rst b/Help/manual/cmake-file-api.7.rst index a6d2345..88a7bab 100644 --- a/Help/manual/cmake-file-api.7.rst +++ b/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. 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. |