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/cmake/interpreter.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/cmake/interpreter.py')
| -rw-r--r-- | mesonbuild/cmake/interpreter.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/mesonbuild/cmake/interpreter.py b/mesonbuild/cmake/interpreter.py index 03ed90d..bac9dad 100644 --- a/mesonbuild/cmake/interpreter.py +++ b/mesonbuild/cmake/interpreter.py @@ -15,7 +15,7 @@ # This class contains the basic functionality needed to run any interpreter # or an interpreter-based tool. -from .common import CMakeException, CMakeTarget, TargetOptions, CMakeConfiguration, language_map +from .common import CMakeException, CMakeTarget, TargetOptions, CMakeConfiguration, language_map, check_cmake_args from .client import CMakeClient, RequestCMakeInputs, RequestConfigure, RequestCompute, RequestCodeModel, ReplyCMakeInputs, ReplyCodeModel from .fileapi import CMakeFileAPI from .executor import CMakeExecutor @@ -862,6 +862,9 @@ class CMakeInterpreter: toolchain = CMakeToolchain(self.env, self.for_machine, CMakeExecScope.SUBPROJECT, self.build_dir.parent, preload_file) toolchain_file = toolchain.write() + # TODO: drop this check once the deprecated `cmake_args` kwarg is removed + extra_cmake_options = check_cmake_args(extra_cmake_options) + generator = backend_generator_map[self.backend_name] cmake_args = [] cmake_args += ['-G', generator] |