diff options
| author | Daniel Mensinger <daniel@mensinger-ka.de> | 2021-05-30 16:33:09 +0200 |
|---|---|---|
| committer | Daniel Mensinger <daniel@mensinger-ka.de> | 2021-05-30 16:33:09 +0200 |
| commit | 9b5463681e8f5df8dbe628be0a95982584b2343b (patch) | |
| tree | ba0bfce27a7355a7f1674d2e4e86a8328d206669 /mesonbuild/cmake/toolchain.py | |
| parent | f0812baf8d1c746a4b5b7d8661a4e3d13af577b7 (diff) | |
| download | meson-9b5463681e8f5df8dbe628be0a95982584b2343b.zip meson-9b5463681e8f5df8dbe628be0a95982584b2343b.tar.gz meson-9b5463681e8f5df8dbe628be0a95982584b2343b.tar.bz2 | |
cmake: select correct generator in toolchain.py
Diffstat (limited to 'mesonbuild/cmake/toolchain.py')
| -rw-r--r-- | mesonbuild/cmake/toolchain.py | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/mesonbuild/cmake/toolchain.py b/mesonbuild/cmake/toolchain.py index c5056d7..f3e487d 100644 --- a/mesonbuild/cmake/toolchain.py +++ b/mesonbuild/cmake/toolchain.py @@ -16,7 +16,7 @@ from pathlib import Path from .traceparser import CMakeTraceParser from ..envconfig import CMakeSkipCompilerTest from ..mesonlib import MachineChoice -from .common import language_map +from .common import language_map, cmake_get_generator_args from .. import mlog import shutil @@ -224,7 +224,10 @@ class CMakeToolchain: # Configure trace = CMakeTraceParser(self.cmakebin.version(), build_dir) self.cmakebin.set_exec_mode(print_cmout=False, always_capture_stderr=trace.requires_stderr()) - cmake_args = [*trace.trace_args(), '-DCMAKE_TOOLCHAIN_FILE=' + temp_toolchain_file.as_posix(), '.'] + cmake_args = [] + cmake_args += trace.trace_args() + cmake_args += cmake_get_generator_args(self.env) + cmake_args += [f'-DCMAKE_TOOLCHAIN_FILE={temp_toolchain_file.as_posix()}', '.'] rc, _, raw_trace = self.cmakebin.call(cmake_args, build_dir=build_dir, disable_cache=True) if rc != 0: |