Skip to content

Commit e746db0

Browse files
bgilberteli-schwartz
authored andcommitted
Document internal dep support in pkgconfig.generate requires arg
Added in #14750 for 1.9.0. Also add FeatureNew. (cherry picked from commit 3734ff4)
1 parent f6ab732 commit e746db0

File tree

1 file changed

+6
-2
lines changed

1 file changed

+6
-2
lines changed

mesonbuild/modules/pkgconfig.py

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -157,6 +157,8 @@ def _process_reqs(self, reqs: T.Sequence[T.Union[str, build.StaticLibrary, build
157157
elif isinstance(obj, dependencies.ExternalDependency) and obj.name == 'threads':
158158
pass
159159
elif isinstance(obj, dependencies.InternalDependency) and all(lib.get_id() in self.metadata for lib in obj.libraries):
160+
FeatureNew.single_use('pkgconfig.generate requirement from internal dependency', '1.9.0',
161+
self.state.subproject, location=self.state.current_node)
160162
# Ensure BothLibraries are resolved:
161163
if self.pub_libs and isinstance(self.pub_libs[0], build.StaticLibrary):
162164
obj = obj.get_as_static(recursive=True)
@@ -166,8 +168,10 @@ def _process_reqs(self, reqs: T.Sequence[T.Union[str, build.StaticLibrary, build
166168
processed_reqs.append(self.metadata[lib.get_id()].filebase)
167169
else:
168170
raise mesonlib.MesonException('requires argument not a string, '
169-
'library with pkgconfig-generated file '
170-
f'or pkgconfig-dependency object, got {obj!r}')
171+
'library with pkgconfig-generated file, '
172+
'pkgconfig-dependency object, or '
173+
'internal-dependency object with '
174+
f'pkgconfig-generated file, got {obj!r}')
171175
return processed_reqs
172176

173177
def add_cflags(self, cflags: T.List[str]) -> None:

0 commit comments

Comments
 (0)