diff options
author | Daniel Mensinger <daniel@mensinger-ka.de> | 2020-10-16 20:44:04 +0200 |
---|---|---|
committer | Daniel Mensinger <daniel@mensinger-ka.de> | 2020-10-16 20:44:04 +0200 |
commit | 5f1da86a9b3ed75c49df7073962c4e9b6a43d497 (patch) | |
tree | 8eda42a121d2ba12b444e5581fb73bd6290ea6c4 /mesonbuild/dependencies/base.py | |
parent | c3b3dc598e8c417e66792444945f7c803d772e62 (diff) | |
download | meson-5f1da86a9b3ed75c49df7073962c4e9b6a43d497.zip meson-5f1da86a9b3ed75c49df7073962c4e9b6a43d497.tar.gz meson-5f1da86a9b3ed75c49df7073962c4e9b6a43d497.tar.bz2 |
cmake: ignore CMAKE_TOOLCHAIN_FILE and CMAKE_PROJECT_INCLUDE to avoid conflicts with the meson CMake logic
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] |