diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2017-11-15 22:51:34 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-15 22:51:34 +0200 |
| commit | e51da1a34d3ac2ed23451e05c971720c20aaa064 (patch) | |
| tree | 4f929542408830518055b5258c3059931ade4d22 /mesonbuild/dependencies/ui.py | |
| parent | b9ef15a7193e55bb72216135066666b7bacbfaf0 (diff) | |
| parent | da654dd2b9ebb91a2202e7a841c4ae1c71ebf8ea (diff) | |
| download | meson-e51da1a34d3ac2ed23451e05c971720c20aaa064.zip meson-e51da1a34d3ac2ed23451e05c971720c20aaa064.tar.gz meson-e51da1a34d3ac2ed23451e05c971720c20aaa064.tar.bz2 | |
Merge pull request #2611 from mesonbuild/nirbheek/pkgconfig-msvc-static
Several fixes to pkg-config dependencies and the pkg-config module (try 3)
Diffstat (limited to 'mesonbuild/dependencies/ui.py')
| -rw-r--r-- | mesonbuild/dependencies/ui.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/mesonbuild/dependencies/ui.py b/mesonbuild/dependencies/ui.py index 8f183e5..3412dc6 100644 --- a/mesonbuild/dependencies/ui.py +++ b/mesonbuild/dependencies/ui.py @@ -23,8 +23,9 @@ from collections import OrderedDict from .. import mlog from .. import mesonlib -from ..mesonlib import MesonException, Popen_safe, version_compare, extract_as_list -from ..environment import for_windows, detect_cpu +from ..mesonlib import MesonException, Popen_safe, version_compare +from ..mesonlib import extract_as_list, for_windows +from ..environment import detect_cpu from .base import DependencyException, DependencyMethods from .base import ExternalDependency, ExternalProgram |