From 15bbf1ea7581a8a872296435b28d679c7e42a466 Mon Sep 17 00:00:00 2001 From: Jason Ekstrand Date: Sat, 20 Jun 2020 09:45:22 -0500 Subject: Handle cmake dependencies which require a specified version Some CMake packages fail to find at all if no version is specified. This commit adds a cmake_version parameter to dependency() to allow you to specify the requested version. --- mesonbuild/interpreter.py | 2 ++ 1 file changed, 2 insertions(+) (limited to 'mesonbuild/interpreter.py') diff --git a/mesonbuild/interpreter.py b/mesonbuild/interpreter.py index 6896a4d..eaea267 100644 --- a/mesonbuild/interpreter.py +++ b/mesonbuild/interpreter.py @@ -2334,6 +2334,7 @@ permitted_kwargs = {'add_global_arguments': {'language', 'native'}, 'version', 'private_headers', 'cmake_args', + 'cmake_package_version', 'include_type', }, 'declare_dependency': {'include_directories', @@ -3716,6 +3717,7 @@ external dependencies (including libraries) must go to "dependencies".''') elif name == 'openmp': FeatureNew.single_use('OpenMP Dependency', '0.46.0', self.subproject) + @FeatureNewKwargs('dependency', '0.57.0', ['cmake_package_version']) @FeatureNewKwargs('dependency', '0.54.0', ['components']) @FeatureNewKwargs('dependency', '0.52.0', ['include_type']) @FeatureNewKwargs('dependency', '0.50.0', ['not_found_message', 'cmake_module_path', 'cmake_args']) -- cgit v1.1