aboutsummaryrefslogtreecommitdiff
path: root/mesonbuild/dependencies/misc.py
diff options
context:
space:
mode:
authorDaniel Mensinger <daniel@mensinger-ka.de>2018-11-22 21:30:12 +0100
committerJussi Pakkanen <jpakkane@gmail.com>2018-11-22 22:30:12 +0200
commita0175ecb1412ed1c824e5eaf1629be9ed95f0b78 (patch)
treed3ac1d8f77b921d1517ca4b7290b8ed37ea7ea08 /mesonbuild/dependencies/misc.py
parent8b88fb990e165a501c3b5798139c21647218c978 (diff)
downloadmeson-a0175ecb1412ed1c824e5eaf1629be9ed95f0b78.zip
meson-a0175ecb1412ed1c824e5eaf1629be9ed95f0b78.tar.gz
meson-a0175ecb1412ed1c824e5eaf1629be9ed95f0b78.tar.bz2
CMake find_package dependency backend (#4444)
Diffstat (limited to 'mesonbuild/dependencies/misc.py')
-rw-r--r--mesonbuild/dependencies/misc.py9
1 files changed, 6 insertions, 3 deletions
diff --git a/mesonbuild/dependencies/misc.py b/mesonbuild/dependencies/misc.py
index 1dab19c..9e0a65a 100644
--- a/mesonbuild/dependencies/misc.py
+++ b/mesonbuild/dependencies/misc.py
@@ -29,7 +29,7 @@ from ..environment import detect_cpu_family
from .base import (
DependencyException, DependencyMethods, ExternalDependency,
ExternalProgram, ExtraFrameworkDependency, PkgConfigDependency,
- ConfigToolDependency,
+ CMakeDependency, ConfigToolDependency,
)
@@ -475,6 +475,9 @@ class CupsDependency(ExternalDependency):
ExtraFrameworkDependency, 'cups', False, None, environment,
kwargs.get('language', None), kwargs))
+ if DependencyMethods.CMAKE in methods:
+ candidates.append(functools.partial(CMakeDependency, 'Cups', environment, kwargs))
+
return candidates
@staticmethod
@@ -485,9 +488,9 @@ class CupsDependency(ExternalDependency):
@staticmethod
def get_methods():
if mesonlib.is_osx():
- return [DependencyMethods.PKGCONFIG, DependencyMethods.CONFIG_TOOL, DependencyMethods.EXTRAFRAMEWORK]
+ return [DependencyMethods.PKGCONFIG, DependencyMethods.CONFIG_TOOL, DependencyMethods.EXTRAFRAMEWORK, DependencyMethods.CMAKE]
else:
- return [DependencyMethods.PKGCONFIG, DependencyMethods.CONFIG_TOOL]
+ return [DependencyMethods.PKGCONFIG, DependencyMethods.CONFIG_TOOL, DependencyMethods.CMAKE]
class LibWmfDependency(ExternalDependency):