diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2022-03-07 16:12:19 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-03-07 16:12:19 +0200 |
| commit | 219f40c1e4689060f3c299edd463fc5f5a625608 (patch) | |
| tree | 0f3d2565382221b62368569cc049be2f0389f670 /mesonbuild/cmake/interpreter.py | |
| parent | 0f2f87a003477bd79487a47d5f60f67751e2f44e (diff) | |
| parent | 7ab2ceb2733442a2c3ca1284f545f28abcd5a14a (diff) | |
| download | meson-219f40c1e4689060f3c299edd463fc5f5a625608.zip meson-219f40c1e4689060f3c299edd463fc5f5a625608.tar.gz meson-219f40c1e4689060f3c299edd463fc5f5a625608.tar.bz2 | |
Merge pull request #9743 from mensinda/cmakeGeneratorFixed
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 44b7e57..a619d1a 100644 --- a/mesonbuild/cmake/interpreter.py +++ b/mesonbuild/cmake/interpreter.py @@ -784,7 +784,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 @@ -805,7 +805,7 @@ class CMakeInterpreter: cmake_exe = CMakeExecutor(self.env, '>=3.14', 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) |