aboutsummaryrefslogtreecommitdiff
path: root/mesonbuild/dependencies
diff options
context:
space:
mode:
authorAlf Henrik Sauge <alf.henrik.sauge@gmail.com>2022-08-11 15:18:27 +0200
committerEli Schwartz <eschwartz93@gmail.com>2022-08-26 17:12:40 -0400
commit06bf9a5cdae6a185a29e5ea5bcaf18ad3e3e042a (patch)
treea909a90a2734935d732dcc087dc173d80da76425 /mesonbuild/dependencies
parent47a0ed5924ea05ac58a9a36f60670b79e76c6273 (diff)
downloadmeson-06bf9a5cdae6a185a29e5ea5bcaf18ad3e3e042a.zip
meson-06bf9a5cdae6a185a29e5ea5bcaf18ad3e3e042a.tar.gz
meson-06bf9a5cdae6a185a29e5ea5bcaf18ad3e3e042a.tar.bz2
Fix purely white space issues reported by flake8
Diffstat (limited to 'mesonbuild/dependencies')
-rw-r--r--mesonbuild/dependencies/cmake.py4
-rw-r--r--mesonbuild/dependencies/detect.py2
-rw-r--r--mesonbuild/dependencies/factory.py10
3 files changed, 8 insertions, 8 deletions
diff --git a/mesonbuild/dependencies/cmake.py b/mesonbuild/dependencies/cmake.py
index 5c4edd4..62d6ebf 100644
--- a/mesonbuild/dependencies/cmake.py
+++ b/mesonbuild/dependencies/cmake.py
@@ -106,7 +106,7 @@ class CMakeDependency(ExternalDependency):
# Store a copy of the CMake path on the object itself so it is
# stored in the pickled coredata and recovered.
self.cmakebin: T.Optional[CMakeExecutor] = None
- self.cmakeinfo: T.Optional[CMakeInfo] = None
+ self.cmakeinfo: T.Optional[CMakeInfo] = None
# Where all CMake "build dirs" are located
self.cmake_root_dir = environment.scratch_dir
@@ -553,7 +553,7 @@ class CMakeDependency(ExternalDependency):
)
incDirs += rtgt.include_directories
compileOptions += rtgt.public_compile_opts
- libraries += rtgt.libraries + rtgt.link_flags
+ libraries += rtgt.libraries + rtgt.link_flags
# Make sure all elements in the lists are unique and sorted
incDirs = sorted(set(incDirs))
diff --git a/mesonbuild/dependencies/detect.py b/mesonbuild/dependencies/detect.py
index a721cba..e4766cd 100644
--- a/mesonbuild/dependencies/detect.py
+++ b/mesonbuild/dependencies/detect.py
@@ -103,7 +103,7 @@ def find_external_dependency(name: str, env: 'Environment', kwargs: T.Dict[str,
candidates = _build_external_dependency_list(name, env, for_machine, kwargs)
pkg_exc: T.List[DependencyException] = []
- pkgdep: T.List[ExternalDependency] = []
+ pkgdep: T.List[ExternalDependency] = []
details = ''
for c in candidates:
diff --git a/mesonbuild/dependencies/factory.py b/mesonbuild/dependencies/factory.py
index 8474b51..b26bbd6 100644
--- a/mesonbuild/dependencies/factory.py
+++ b/mesonbuild/dependencies/factory.py
@@ -101,11 +101,11 @@ class DependencyFactory:
# Just attach the correct name right now, either the generic name
# or the method specific name.
DependencyMethods.EXTRAFRAMEWORK: lambda env, kwargs: framework_class(framework_name or name, env, kwargs),
- DependencyMethods.PKGCONFIG: lambda env, kwargs: pkgconfig_class(pkgconfig_name or name, env, kwargs),
- DependencyMethods.CMAKE: lambda env, kwargs: cmake_class(cmake_name or name, env, kwargs),
- DependencyMethods.SYSTEM: lambda env, kwargs: system_class(name, env, kwargs),
- DependencyMethods.BUILTIN: lambda env, kwargs: builtin_class(name, env, kwargs),
- DependencyMethods.CONFIG_TOOL: None,
+ DependencyMethods.PKGCONFIG: lambda env, kwargs: pkgconfig_class(pkgconfig_name or name, env, kwargs),
+ DependencyMethods.CMAKE: lambda env, kwargs: cmake_class(cmake_name or name, env, kwargs),
+ DependencyMethods.SYSTEM: lambda env, kwargs: system_class(name, env, kwargs),
+ DependencyMethods.BUILTIN: lambda env, kwargs: builtin_class(name, env, kwargs),
+ DependencyMethods.CONFIG_TOOL: None,
}
if configtool_class is not None:
self.classes[DependencyMethods.CONFIG_TOOL] = lambda env, kwargs: configtool_class(name, env, kwargs)