diff options
| author | David Ward <david.ward@gatech.edu> | 2022-09-04 08:15:57 -0400 |
|---|---|---|
| committer | Eli Schwartz <eschwartz93@gmail.com> | 2022-09-12 00:27:21 -0400 |
| commit | ee5a72919009f5e7bc2f58199120d56ef9264d59 (patch) | |
| tree | 95f62353170aaba46903bef7217a7fc98094d144 /mesonbuild/modules/gnome.py | |
| parent | 68add86f7b9b50e51e75447077f460bc2dc78e79 (diff) | |
| download | meson-ee5a72919009f5e7bc2f58199120d56ef9264d59.zip meson-ee5a72919009f5e7bc2f58199120d56ef9264d59.tar.gz meson-ee5a72919009f5e7bc2f58199120d56ef9264d59.tar.bz2 | |
modules: Fix paths to (sub)project source/build directories
The subproject directory name (i.e. 'subprojects') was being added
to the path even for the main project.
Diffstat (limited to 'mesonbuild/modules/gnome.py')
| -rw-r--r-- | mesonbuild/modules/gnome.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mesonbuild/modules/gnome.py b/mesonbuild/modules/gnome.py index 1c21cce..bb8c9ac 100644 --- a/mesonbuild/modules/gnome.py +++ b/mesonbuild/modules/gnome.py @@ -1185,8 +1185,8 @@ class GnomeModule(ExtensionModule): scan_command += list(scan_external_ldflags) if self._gir_has_option('--sources-top-dirs'): - scan_command += ['--sources-top-dirs', os.path.join(state.environment.get_source_dir(), self.interpreter.subproject_dir, state.subproject)] - scan_command += ['--sources-top-dirs', os.path.join(state.environment.get_build_dir(), self.interpreter.subproject_dir, state.subproject)] + scan_command += ['--sources-top-dirs', os.path.join(state.environment.get_source_dir(), state.root_subdir)] + scan_command += ['--sources-top-dirs', os.path.join(state.environment.get_build_dir(), state.root_subdir)] if '--warn-error' in scan_command: FeatureDeprecated.single_use('gnome.generate_gir argument --warn-error', '0.55.0', |