diff options
| author | Daniel Mensinger <daniel@mensinger-ka.de> | 2021-12-18 14:04:08 +0100 |
|---|---|---|
| committer | Daniel Mensinger <daniel@mensinger-ka.de> | 2022-01-23 13:22:59 +0100 |
| commit | 42843c4cf6d8e9013ebbf0f77dea7b33bb1ff328 (patch) | |
| tree | 49be850bac008cd0a488e7f19956857a2a1a8d4f /mesonbuild/cmake/interpreter.py | |
| parent | 99aae9b4dfc7f1ab6469adee718d54d9afd45097 (diff) | |
| download | meson-42843c4cf6d8e9013ebbf0f77dea7b33bb1ff328.zip meson-42843c4cf6d8e9013ebbf0f77dea7b33bb1ff328.tar.gz meson-42843c4cf6d8e9013ebbf0f77dea7b33bb1ff328.tar.bz2 | |
cmake: Add TARGET_ generator expression support (fixes #9305)
Diffstat (limited to 'mesonbuild/cmake/interpreter.py')
| -rw-r--r-- | mesonbuild/cmake/interpreter.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mesonbuild/cmake/interpreter.py b/mesonbuild/cmake/interpreter.py index 0b6d241..9582266 100644 --- a/mesonbuild/cmake/interpreter.py +++ b/mesonbuild/cmake/interpreter.py @@ -793,7 +793,7 @@ class CMakeInterpreter: self.languages = [] # type: T.List[str] self.targets = [] # type: T.List[ConverterTarget] self.custom_targets = [] # type: T.List[ConverterCustomTarget] - self.trace = CMakeTraceParser('', Path('.')) # Will be replaced in analyse + self.trace = CMakeTraceParser('', Path('.'), self.env) # Will be replaced in analyse self.output_target_map = OutputTargetMap(self.build_dir) # Generated meson data @@ -814,7 +814,7 @@ class CMakeInterpreter: cmake_exe = CMakeExecutor(self.env, '>=3.7', MachineChoice.BUILD) if not cmake_exe.found(): raise CMakeException('Unable to find CMake') - self.trace = CMakeTraceParser(cmake_exe.version(), self.build_dir, permissive=True) + self.trace = CMakeTraceParser(cmake_exe.version(), self.build_dir, self.env, permissive=True) preload_file = DataFile('cmake/data/preload.cmake').write_to_private(self.env) toolchain = CMakeToolchain(cmake_exe, self.env, self.for_machine, CMakeExecScope.SUBPROJECT, self.build_dir, preload_file) |