aboutsummaryrefslogtreecommitdiff
path: root/mesonbuild/dependencies/base.py
diff options
context:
space:
mode:
authorDylan Baker <dylan@pnwbakers.com>2017-11-08 13:02:11 -0800
committerDylan Baker <dylan@pnwbakers.com>2017-11-23 19:54:48 -0800
commitdf3c0064564760315eb69e78b7c298bf26ad1b59 (patch)
treec225e5ad6332e9a3c1b59331fc26de5c51925f67 /mesonbuild/dependencies/base.py
parent11fbc982d3fcb95b6774e0af6cc7d506fe876dc0 (diff)
downloadmeson-df3c0064564760315eb69e78b7c298bf26ad1b59.zip
meson-df3c0064564760315eb69e78b7c298bf26ad1b59.tar.gz
meson-df3c0064564760315eb69e78b7c298bf26ad1b59.tar.bz2
Use ConfigToolDependency for libwmf
Diffstat (limited to 'mesonbuild/dependencies/base.py')
-rw-r--r--mesonbuild/dependencies/base.py5
1 files changed, 2 insertions, 3 deletions
diff --git a/mesonbuild/dependencies/base.py b/mesonbuild/dependencies/base.py
index 3dcb41a..84b20e7 100644
--- a/mesonbuild/dependencies/base.py
+++ b/mesonbuild/dependencies/base.py
@@ -46,8 +46,6 @@ class DependencyMethods(Enum):
QMAKE = 'qmake'
# Just specify the standard link arguments, assuming the operating system provides the library.
SYSTEM = 'system'
- # Detect using libwmf-config
- LIBWMFCONFIG = 'libwmf-config'
# This is only supported on OSX - search the frameworks directory by name.
EXTRAFRAMEWORK = 'extraframework'
# Detect using the sysconfig module.
@@ -58,6 +56,7 @@ class DependencyMethods(Enum):
SDLCONFIG = 'sdlconfig'
CUPSCONFIG = 'cups-config'
PCAPCONFIG = 'pcap-config'
+ LIBWMFCONFIG = 'libwmf-config'
class Dependency:
@@ -78,7 +77,7 @@ class Dependency:
# This sets per-too config methods which are deprecated to to the new
# generic CONFIG_TOOL value.
if method in [DependencyMethods.SDLCONFIG, DependencyMethods.CUPSCONFIG,
- DependencyMethods.PCAPCONFIG]:
+ DependencyMethods.PCAPCONFIG, DependencyMethods.LIBWMFCONFIG]:
mlog.warning(textwrap.dedent("""\
Configuration method {} has been deprecated in favor of
'config-tool'. This will be removed in a future version of