mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2025-12-30 18:29:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge topic 'fileapi-file-sets-base-dirs-relative'

Browse Source 
a3a85524cd fileapi: Fix file sets' base directories relative to top source

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Reviewed-by: Ben Boeckel <ben.boeckel@kitware.com>
Merge-request: !8977
This commit is contained in:
Brad King
2023-11-20 14:12:42 +00:00
committed by Kitware Robot
parent 79811a2d2b a3a85524cd
commit b6845a689e
4 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Help/manual/cmake-file-api.7.rst
View File

@@ -1094,7 +1094,9 @@ with members:
``baseDirectories``
A JSON array of strings specifying the base directories containing sources
in the file set.
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.
This field was added in codemodel version 2.5.

2
Source/cmFileAPICodemodel.cxx
View File

@@ -1635,7 +1635,7 @@ Json::Value Target::DumpFileSet(cmFileSet const* fs,
Json::Value baseDirs = Json::arrayValue;
for (auto const& directory : directories) {
baseDirs.append(directory);
baseDirs.append(RelativeIfUnder(this->TopSource, directory));
}
fileSet["baseDirectories"] = baseDirs;

8
Tests/RunCMake/FileAPI/codemodel-v2-data/targets/c_headers_1.json
View File

@@ -10,25 +10,25 @@
"name": "HEADERS",
"type": "HEADERS",
"visibility": "PUBLIC",
"baseDirectories": [".*/Tests/RunCMake/FileAPI/fileset$"]
"baseDirectories": ["^fileset$"]
},
{
"name": "a",
"type": "HEADERS",
"visibility": "PRIVATE",
"baseDirectories": [".*/Tests/RunCMake/FileAPI/fileset$"]
"baseDirectories": ["^fileset$"]
},
{
"name": "b",
"type": "HEADERS",
"visibility": "PUBLIC",
"baseDirectories": [".*/Tests/RunCMake/FileAPI/fileset/dir$"]
"baseDirectories": ["^fileset/dir$"]
},
{
"name": "c",
"type": "HEADERS",
"visibility": "INTERFACE",
"baseDirectories": [".*/Tests/RunCMake/FileAPI/fileset$"]
"baseDirectories": ["^fileset$"]
}
],
"sources": [

2
Tests/RunCMake/FileAPI/codemodel-v2-data/targets/c_headers_2.json
View File

@@ -10,7 +10,7 @@
"name": "HEADERS",
"type": "HEADERS",
"visibility": "INTERFACE",
"baseDirectories": [".*/Tests/RunCMake/FileAPI/fileset$"]
"baseDirectories": ["^fileset$"]
}
],
"sources": [