diff options
| author | Dylan Baker <dylan@pnwbakers.com> | 2017-10-19 10:53:10 -0700 |
|---|---|---|
| committer | Dylan Baker <dylan@pnwbakers.com> | 2017-11-23 19:54:48 -0800 |
| commit | a2f31821723d1e7bd445b73c58ec733c199be9d2 (patch) | |
| tree | aeda79c54044cbb8f82d7861871d5766992b78c1 /mesonbuild/dependencies/base.py | |
| parent | 8e53dec314901ce65d2ccfb6cb7011c1b3fef976 (diff) | |
| download | meson-a2f31821723d1e7bd445b73c58ec733c199be9d2.zip meson-a2f31821723d1e7bd445b73c58ec733c199be9d2.tar.gz meson-a2f31821723d1e7bd445b73c58ec733c199be9d2.tar.bz2 | |
Use ConfigToolDependency for cups
Diffstat (limited to 'mesonbuild/dependencies/base.py')
| -rw-r--r-- | mesonbuild/dependencies/base.py | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/mesonbuild/dependencies/base.py b/mesonbuild/dependencies/base.py index b2bf3b3..46d0a99 100644 --- a/mesonbuild/dependencies/base.py +++ b/mesonbuild/dependencies/base.py @@ -48,8 +48,6 @@ class DependencyMethods(Enum): SYSTEM = 'system' # Detect using pcap-config PCAPCONFIG = 'pcap-config' - # Detect using cups-config - CUPSCONFIG = 'cups-config' # Detect using libwmf-config LIBWMFCONFIG = 'libwmf-config' # This is only supported on OSX - search the frameworks directory by name. @@ -60,6 +58,7 @@ class DependencyMethods(Enum): CONFIG_TOOL = 'config-tool' # For backewards compatibility SDLCONFIG = 'sdlconfig' + CUPSCONFIG = 'cups-config' class Dependency: @@ -79,7 +78,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]: + if method in [DependencyMethods.SDLCONFIG, DependencyMethods.CUPSCONFIG]: mlog.warning(textwrap.dedent("""\ Configuration method {} has been deprecated in favor of 'config-tool'. This will be removed in a future version of |