diff options
Diffstat (limited to 'mesonbuild/dependencies')
| -rw-r--r-- | mesonbuild/dependencies/cmake.py | 5 | ||||
| -rw-r--r-- | mesonbuild/dependencies/pkgconfig.py | 5 |
2 files changed, 6 insertions, 4 deletions
diff --git a/mesonbuild/dependencies/cmake.py b/mesonbuild/dependencies/cmake.py index da5db5c3a..2a98020a9 100644 --- a/mesonbuild/dependencies/cmake.py +++ b/mesonbuild/dependencies/cmake.py @@ -126,9 +126,10 @@ class CMakeDependency(ExternalDependency): cm_args = check_cmake_args(cm_args) if CMakeDependency.class_cmakeinfo[self.for_machine] is None: CMakeDependency.class_cmakeinfo[self.for_machine] = self._get_cmake_info(cm_args) - self.cmakeinfo = CMakeDependency.class_cmakeinfo[self.for_machine] - if self.cmakeinfo is None: + cmakeinfo = CMakeDependency.class_cmakeinfo[self.for_machine] + if cmakeinfo is None: raise self._gen_exception('Unable to obtain CMake system information') + self.cmakeinfo = cmakeinfo package_version = kwargs.get('cmake_package_version', '') if not isinstance(package_version, str): diff --git a/mesonbuild/dependencies/pkgconfig.py b/mesonbuild/dependencies/pkgconfig.py index d00001811..30e3d2896 100644 --- a/mesonbuild/dependencies/pkgconfig.py +++ b/mesonbuild/dependencies/pkgconfig.py @@ -277,13 +277,14 @@ class PkgConfigDependency(ExternalDependency): super().__init__(DependencyTypeName('pkgconfig'), environment, kwargs, language=language) self.name = name self.is_libtool = False - self.pkgconfig = PkgConfigInterface.instance(self.env, self.for_machine, self.silent) - if not self.pkgconfig: + pkgconfig = PkgConfigInterface.instance(self.env, self.for_machine, self.silent) + if not pkgconfig: msg = f'Pkg-config for machine {self.for_machine} not found. Giving up.' if self.required: raise DependencyException(msg) mlog.debug(msg) return + self.pkgconfig = pkgconfig version = self.pkgconfig.version(name) if version is None: |