diff options
Diffstat (limited to 'mesonbuild/cmake/toolchain.py')
| -rw-r--r-- | mesonbuild/cmake/toolchain.py | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/mesonbuild/cmake/toolchain.py b/mesonbuild/cmake/toolchain.py index b70a5bc..c854828 100644 --- a/mesonbuild/cmake/toolchain.py +++ b/mesonbuild/cmake/toolchain.py @@ -37,20 +37,20 @@ class CMakeExecScope(Enum): class CMakeToolchain: def __init__(self, cmakebin: 'CMakeExecutor', env: 'Environment', for_machine: MachineChoice, exec_scope: CMakeExecScope, build_dir: Path, preload_file: T.Optional[Path] = None) -> None: - self.env = env - self.cmakebin = cmakebin - self.for_machine = for_machine - self.exec_scope = exec_scope - self.preload_file = preload_file - self.build_dir = build_dir - self.build_dir = self.build_dir.resolve() + self.env = env + self.cmakebin = cmakebin + self.for_machine = for_machine + self.exec_scope = exec_scope + self.preload_file = preload_file + self.build_dir = build_dir + self.build_dir = self.build_dir.resolve() self.toolchain_file = build_dir / 'CMakeMesonToolchainFile.cmake' - self.cmcache_file = build_dir / 'CMakeCache.txt' - self.minfo = self.env.machines[self.for_machine] - self.properties = self.env.properties[self.for_machine] - self.compilers = self.env.coredata.compilers[self.for_machine] - self.cmakevars = self.env.cmakevars[self.for_machine] - self.cmakestate = self.env.coredata.cmake_cache[self.for_machine] + self.cmcache_file = build_dir / 'CMakeCache.txt' + self.minfo = self.env.machines[self.for_machine] + self.properties = self.env.properties[self.for_machine] + self.compilers = self.env.coredata.compilers[self.for_machine] + self.cmakevars = self.env.cmakevars[self.for_machine] + self.cmakestate = self.env.coredata.cmake_cache[self.for_machine] self.variables = self.get_defaults() self.variables.update(self.cmakevars.get_variables()) @@ -165,7 +165,7 @@ class CMakeToolchain: # Only set these in a cross build. Otherwise CMake will trip up in native # builds and thing they are cross (which causes TRY_RUN() to break) if self.env.is_cross_build(when_building_for=self.for_machine): - defaults['CMAKE_SYSTEM_NAME'] = [SYSTEM_MAP.get(self.minfo.system, self.minfo.system)] + defaults['CMAKE_SYSTEM_NAME'] = [SYSTEM_MAP.get(self.minfo.system, self.minfo.system)] defaults['CMAKE_SYSTEM_PROCESSOR'] = [self.minfo.cpu_family] defaults['CMAKE_SIZEOF_VOID_P'] = ['8' if self.minfo.is_64_bit else '4'] @@ -216,8 +216,8 @@ class CMakeToolchain: # Generate the CMakeLists.txt mlog.debug('CMake Toolchain: Calling CMake once to generate the compiler state') - languages = list(self.compilers.keys()) - lang_ids = [language_map.get(x, x.upper()) for x in languages] + languages = list(self.compilers.keys()) + lang_ids = [language_map.get(x, x.upper()) for x in languages] cmake_content = dedent(f''' cmake_minimum_required(VERSION 3.7) project(CompInfo {' '.join(lang_ids)}) @@ -253,7 +253,7 @@ class CMakeToolchain: for lang in languages: lang_cmake = language_map.get(lang, lang.upper()) - file_name = f'CMake{lang_cmake}Compiler.cmake' + file_name = f'CMake{lang_cmake}Compiler.cmake' vars = vars_by_file.setdefault(file_name, {}) vars[f'CMAKE_{lang_cmake}_COMPILER_FORCED'] = ['1'] self.cmakestate.update(lang, vars) |