diff options
| author | Dylan Baker <dylan@pnwbakers.com> | 2020-10-01 13:02:08 -0700 |
|---|---|---|
| committer | Xavier Claessens <xclaesse@gmail.com> | 2021-03-19 08:47:10 -0400 |
| commit | 40e3577a65ac688814eff1239fa38b86aad19ee8 (patch) | |
| tree | 8329ecb3418c58c43ef7ccf1c0f354aab530ed5f /mesonbuild/modules/cmake.py | |
| parent | f7b0238ed67fc0c9e3cef38090983e33b40fa205 (diff) | |
| download | meson-40e3577a65ac688814eff1239fa38b86aad19ee8.zip meson-40e3577a65ac688814eff1239fa38b86aad19ee8.tar.gz meson-40e3577a65ac688814eff1239fa38b86aad19ee8.tar.bz2 | |
split program related classes and functions out of dependencies
Dependencies is already a large and complicated package without adding
programs to the list. This also allows us to untangle a bit of spaghetti
that we have.
Diffstat (limited to 'mesonbuild/modules/cmake.py')
| -rw-r--r-- | mesonbuild/modules/cmake.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/mesonbuild/modules/cmake.py b/mesonbuild/modules/cmake.py index fd92ecf..84fe658 100644 --- a/mesonbuild/modules/cmake.py +++ b/mesonbuild/modules/cmake.py @@ -18,7 +18,7 @@ import typing as T from . import ExtensionModule, ModuleReturnValue -from .. import build, dependencies, mesonlib, mlog +from .. import build, mesonlib, mlog from ..cmake import SingleTargetOptions, TargetOptions, cmake_defines_to_args from ..interpreter import ConfigurationDataHolder, InterpreterException, SubprojectHolder, DependencyHolder from ..interpreterbase import ( @@ -36,6 +36,7 @@ from ..interpreterbase import ( InvalidArguments, ) +from ..programs import ExternalProgram COMPATIBILITIES = ['AnyNewerVersion', 'SameMajorVersion', 'SameMinorVersion', 'ExactVersion'] @@ -232,7 +233,7 @@ class CmakeModule(ExtensionModule): if self.cmake_detected: return True - cmakebin = dependencies.ExternalProgram('cmake', silent=False) + cmakebin = ExternalProgram('cmake', silent=False) p, stdout, stderr = mesonlib.Popen_safe(cmakebin.get_command() + ['--system-information', '-G', 'Ninja'])[0:3] if p.returncode != 0: mlog.log(f'error retrieving cmake information: returnCode={p.returncode} stdout={stdout} stderr={stderr}') |