From f3aaebde4050c1906d69db20fc9fc2eb5c0c4371 Mon Sep 17 00:00:00 2001 From: Xavier Claessens Date: Mon, 28 Aug 2023 19:22:00 -0400 Subject: modules: Fix state.project_name value It was the name of root project instead of current subproject. This is only used by pkgconfig generator. While at it, simplify the way we get the project version. --- mesonbuild/modules/__init__.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'mesonbuild/modules/__init__.py') diff --git a/mesonbuild/modules/__init__.py b/mesonbuild/modules/__init__.py index 87892e6d7..3ff9368d9 100644 --- a/mesonbuild/modules/__init__.py +++ b/mesonbuild/modules/__init__.py @@ -41,8 +41,8 @@ class ModuleState: self.root_subdir = interpreter.root_subdir self.current_lineno = interpreter.current_node.lineno self.environment = interpreter.environment - self.project_name = interpreter.build.project_name - self.project_version = interpreter.build.dep_manifest[interpreter.active_projectname].version + self.project_name = interpreter.active_projectname + self.project_version = interpreter.project_version # The backend object is under-used right now, but we will need it: # https://github.com/mesonbuild/meson/issues/1419 self.backend = interpreter.backend -- cgit v1.2.3