aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDylan Baker <dylan@pnwbakers.com>2021-03-22 11:56:49 -0700
committerDylan Baker <dylan@pnwbakers.com>2021-03-23 15:28:08 -0700
commitc86c18066e8d163eabe18f5d6d024c7ac97df988 (patch)
tree703e30c46b85a0a807aac4474dcb8355a6e64f2b
parentc211fea51389728783cf59ae41156a5e0de9c41a (diff)
downloadmeson-c86c18066e8d163eabe18f5d6d024c7ac97df988.zip
meson-c86c18066e8d163eabe18f5d6d024c7ac97df988.tar.gz
meson-c86c18066e8d163eabe18f5d6d024c7ac97df988.tar.bz2
deprecated QMAKE dependency type
Instead of using qmake, use config-tool. This is no different than when we deprecated the other per-dependency config-tool types (sdl2-config, llvm-config, etc) for just config-tool
-rw-r--r--mesonbuild/dependencies/base.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/mesonbuild/dependencies/base.py b/mesonbuild/dependencies/base.py
index 8944780..14380d4 100644
--- a/mesonbuild/dependencies/base.py
+++ b/mesonbuild/dependencies/base.py
@@ -57,7 +57,6 @@ class DependencyMethods(Enum):
# Auto means to use whatever dependency checking mechanisms in whatever order meson thinks is best.
AUTO = 'auto'
PKGCONFIG = 'pkg-config'
- QMAKE = 'qmake'
CMAKE = 'cmake'
# Just specify the standard link arguments, assuming the operating system provides the library.
SYSTEM = 'system'
@@ -72,6 +71,7 @@ class DependencyMethods(Enum):
CUPSCONFIG = 'cups-config'
PCAPCONFIG = 'pcap-config'
LIBWMFCONFIG = 'libwmf-config'
+ QMAKE = 'qmake'
# Misc
DUB = 'dub'
@@ -2281,6 +2281,9 @@ def process_method_kw(possible: T.Iterable[DependencyMethods], kwargs) -> T.List
DependencyMethods.PCAPCONFIG, DependencyMethods.LIBWMFCONFIG]:
FeatureDeprecated.single_use(f'Configuration method {method.value}', '0.44', 'Use "config-tool" instead.')
method = DependencyMethods.CONFIG_TOOL
+ if method is DependencyMethods.QMAKE:
+ FeatureDeprecated.single_use(f'Configuration method "qmake"', '0.58', 'Use "config-tool" instead.')
+ method = DependencyMethods.CONFIG_TOOL
# Set the detection method. If the method is set to auto, use any available method.
# If method is set to a specific string, allow only that detection method.