diff options
author | Jussi Pakkanen <jpakkane@gmail.com> | 2020-10-17 12:35:35 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-10-17 12:35:35 +0300 |
commit | 66d3747efef9343ce2d98d24fe9be47c2432a941 (patch) | |
tree | f99e70dd6f4080deb8bd0f3a6b9ece491c72b884 /mesonbuild/dependencies/base.py | |
parent | ed70c6df52bcb28be72721ff0c2e1af9a491c967 (diff) | |
parent | 36cde6f91e0710b9c6ee87bd055383e52525fa75 (diff) | |
download | meson-66d3747efef9343ce2d98d24fe9be47c2432a941.zip meson-66d3747efef9343ce2d98d24fe9be47c2432a941.tar.gz meson-66d3747efef9343ce2d98d24fe9be47c2432a941.tar.bz2 |
Merge pull request #7859 from mensinda/cmBlacklist
cmake: ignore CMAKE_TOOLCHAIN_FILE and CMAKE_PROJECT_INCLUDE
Diffstat (limited to 'mesonbuild/dependencies/base.py')
-rw-r--r-- | mesonbuild/dependencies/base.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/mesonbuild/dependencies/base.py b/mesonbuild/dependencies/base.py index 2e56565..3a5f5f8 100644 --- a/mesonbuild/dependencies/base.py +++ b/mesonbuild/dependencies/base.py @@ -34,7 +34,7 @@ from .. import mesonlib from ..compilers import clib_langs from ..envconfig import get_env_var from ..environment import BinaryTable, Environment, MachineInfo -from ..cmake import CMakeExecutor, CMakeTraceParser, CMakeException, CMakeToolchain, CMakeExecScope +from ..cmake import CMakeExecutor, CMakeTraceParser, CMakeException, CMakeToolchain, CMakeExecScope, check_cmake_args from ..mesonlib import MachineChoice, MesonException, OrderedSet, PerMachine from ..mesonlib import Popen_safe, version_compare_many, version_compare, listify, stringlistify, extract_as_list, split_args from ..mesonlib import Version, LibType @@ -1100,6 +1100,7 @@ class CMakeDependency(ExternalDependency): self.traceparser = CMakeTraceParser(self.cmakebin.version(), self._get_build_dir()) cm_args = stringlistify(extract_as_list(kwargs, 'cmake_args')) + cm_args = check_cmake_args(cm_args) if CMakeDependency.class_cmakeinfo[self.for_machine] is None: CMakeDependency.class_cmakeinfo[self.for_machine] = self._get_cmake_info(cm_args) self.cmakeinfo = CMakeDependency.class_cmakeinfo[self.for_machine] |