diff options
| author | John Ericson <git@JohnEricson.me> | 2020-04-21 11:48:30 -0400 |
|---|---|---|
| committer | John Ericson <git@JohnEricson.me> | 2020-04-21 11:55:07 -0400 |
| commit | 87aa98c1787d800145853a8e84654e4c54ee1078 (patch) | |
| tree | 8802cdb36b9fb44bfa27b6a9460599d889b479bb /mesonbuild/cmake | |
| parent | ed6bf2b4017b42d7a3ee0a74fabaa6097c9404dd (diff) | |
| download | meson-87aa98c1787d800145853a8e84654e4c54ee1078.zip meson-87aa98c1787d800145853a8e84654e4c54ee1078.tar.gz meson-87aa98c1787d800145853a8e84654e4c54ee1078.tar.bz2 | |
More progress
Diffstat (limited to 'mesonbuild/cmake')
| -rw-r--r-- | mesonbuild/cmake/executor.py | 6 | ||||
| -rw-r--r-- | mesonbuild/cmake/interpreter.py | 24 |
2 files changed, 15 insertions, 15 deletions
diff --git a/mesonbuild/cmake/executor.py b/mesonbuild/cmake/executor.py index ddf2a6d..349c8ec 100644 --- a/mesonbuild/cmake/executor.py +++ b/mesonbuild/cmake/executor.py @@ -280,9 +280,9 @@ class CMakeExecutor: mlog.debug('Failed to find a {} compiler for CMake. This might cause CMake to fail.'.format(lang)) return fallback, '' - c_comp, c_launcher = choose_compiler('c') - cxx_comp, cxx_launcher = choose_compiler('cpp') - fortran_comp, fortran_launcher = choose_compiler('fortran') + c_comp, c_launcher = choose_compiler(Language.C) + cxx_comp, cxx_launcher = choose_compiler(Language.CPP) + fortran_comp, fortran_launcher = choose_compiler(Language.FORTRAN) # on Windows, choose_compiler returns path with \ as separator - replace by / before writing to CMAKE file c_comp = c_comp.replace('\\', '/') diff --git a/mesonbuild/cmake/interpreter.py b/mesonbuild/cmake/interpreter.py index 125f18b..6208696 100644 --- a/mesonbuild/cmake/interpreter.py +++ b/mesonbuild/cmake/interpreter.py @@ -24,7 +24,7 @@ from .executor import CMakeExecutor from .traceparser import CMakeTraceParser, CMakeGeneratorTarget from .. import mlog from ..environment import Environment -from ..mesonlib import MachineChoice, OrderedSet, version_compare +from ..mesonlib import Language, MachineChoice, OrderedSet, version_compare from ..compilers.compilers import lang_suffixes, header_suffixes, obj_suffixes, lib_suffixes, is_header from enum import Enum from functools import lru_cache @@ -77,15 +77,15 @@ backend_generator_map = { } language_map = { - 'c': 'C', - 'cpp': 'CXX', - 'cuda': 'CUDA', - 'objc': 'OBJC', - 'objcpp': 'OBJCXX', - 'cs': 'CSharp', - 'java': 'Java', - 'fortran': 'Fortran', - 'swift': 'Swift', + Language.C: 'C', + Language.CPP: 'CXX', + Language.CUDA: 'CUDA', + Language.OBJC: 'OBJC', + Language.OBJCPP: 'OBJCXX', + Language.CS: 'CSharp', + Language.JAVA: 'Java', + Language.FORTRAN: 'Fortran', + Language.SWIFT: 'Swift', } target_type_map = { @@ -253,7 +253,7 @@ class ConverterTarget: for i in target.files: # Determine the meson language lang_cmake_to_meson = {val.lower(): key for key, val in language_map.items()} - lang = lang_cmake_to_meson.get(i.language.lower(), 'c') + lang = lang_cmake_to_meson.get(i.language.lower(), Language.C) if lang not in self.languages: self.languages += [lang] if lang not in self.compile_opts: @@ -281,7 +281,7 @@ class ConverterTarget: def postprocess(self, output_target_map: OutputTargetMap, root_src_dir: str, subdir: str, install_prefix: str, trace: CMakeTraceParser) -> None: # Detect setting the C and C++ standard - for i in ['c', 'cpp']: + for i in [Language.C, Language.CPP]: if i not in self.compile_opts: continue |