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/modules | |
| parent | ed6bf2b4017b42d7a3ee0a74fabaa6097c9404dd (diff) | |
| download | meson-87aa98c1787d800145853a8e84654e4c54ee1078.zip meson-87aa98c1787d800145853a8e84654e4c54ee1078.tar.gz meson-87aa98c1787d800145853a8e84654e4c54ee1078.tar.bz2 | |
More progress
Diffstat (limited to 'mesonbuild/modules')
| -rw-r--r-- | mesonbuild/modules/cmake.py | 4 | ||||
| -rw-r--r-- | mesonbuild/modules/gnome.py | 10 | ||||
| -rw-r--r-- | mesonbuild/modules/pkgconfig.py | 6 | ||||
| -rw-r--r-- | mesonbuild/modules/windows.py | 2 |
4 files changed, 11 insertions, 11 deletions
diff --git a/mesonbuild/modules/cmake.py b/mesonbuild/modules/cmake.py index 6c4098b..0283d11 100644 --- a/mesonbuild/modules/cmake.py +++ b/mesonbuild/modules/cmake.py @@ -129,9 +129,9 @@ class CmakeModule(ExtensionModule): def detect_voidp_size(self, env): compilers = env.coredata.compilers.host - compiler = compilers.get('c', None) + compiler = compilers.get(Language.C, None) if not compiler: - compiler = compilers.get('cpp', None) + compiler = compilers.get(Language.CPP, None) if not compiler: raise mesonlib.MesonException('Requires a C or C++ compiler to compute sizeof(void *).') diff --git a/mesonbuild/modules/gnome.py b/mesonbuild/modules/gnome.py index 8317629..21360a2 100644 --- a/mesonbuild/modules/gnome.py +++ b/mesonbuild/modules/gnome.py @@ -559,7 +559,7 @@ class GnomeModule(ExtensionModule): for girtarget in girtargets: for lang, compiler in girtarget.compilers.items(): # XXX: Can you use g-i with any other language? - if lang in ('c', 'cpp', 'objc', 'objcpp', 'd'): + if lang in (Language.C, Language.CPP, Language.OBJC, Language.OBJCPP, Language.D): ret.append((lang, compiler)) break @@ -1062,11 +1062,11 @@ This will become a hard error in the future.''') ldflags.extend(internal_ldflags) ldflags.extend(external_ldflags) - cflags.extend(state.environment.coredata.get_external_args(MachineChoice.HOST, 'c')) - ldflags.extend(state.environment.coredata.get_external_link_args(MachineChoice.HOST, 'c')) - compiler = state.environment.coredata.compilers[MachineChoice.HOST]['c'] + cflags.extend(state.environment.coredata.get_external_args(MachineChoice.HOST, Language.C)) + ldflags.extend(state.environment.coredata.get_external_link_args(MachineChoice.HOST, Language.C)) + compiler = state.environment.coredata.compilers[MachineChoice.HOST][Language.C] - compiler_flags = self._get_langs_compilers_flags(state, [('c', compiler)]) + compiler_flags = self._get_langs_compilers_flags(state, [(Language.C, compiler)]) cflags.extend(compiler_flags[0]) ldflags.extend(compiler_flags[1]) ldflags.extend(compiler_flags[2]) diff --git a/mesonbuild/modules/pkgconfig.py b/mesonbuild/modules/pkgconfig.py index 666a93d..ac51e36 100644 --- a/mesonbuild/modules/pkgconfig.py +++ b/mesonbuild/modules/pkgconfig.py @@ -325,7 +325,7 @@ class PkgConfigModule(ExtensionModule): install_dir = l.get_custom_install_dir()[0] if install_dir is False: continue - if 'cs' in l.compilers: + if Language.CS in l.compilers: if isinstance(install_dir, str): Lflag = '-r${prefix}/%s/%s' % (self._escape(self._make_relative(prefix, install_dir)), l.filename) else: # install_dir is True @@ -343,7 +343,7 @@ class PkgConfigModule(ExtensionModule): # find the library if l.name_suffix_set: mlog.warning(msg.format(l.name, 'name_suffix', lname, pcfile)) - if 'cs' not in l.compilers: + if Language.CS not in l.compilers: yield '-l%s' % lname def get_uninstalled_include_dirs(libs): @@ -463,7 +463,7 @@ class PkgConfigModule(ExtensionModule): dversions = kwargs.get('d_module_versions', None) if dversions: - compiler = state.environment.coredata.compilers.host.get('d') + compiler = state.environment.coredata.compilers.host.get(Language.D) if compiler: deps.add_cflags(compiler.get_feature_args({'versions': dversions}, None)) diff --git a/mesonbuild/modules/windows.py b/mesonbuild/modules/windows.py index b3e4983..f939782 100644 --- a/mesonbuild/modules/windows.py +++ b/mesonbuild/modules/windows.py @@ -33,7 +33,7 @@ class ResourceCompilerType(enum.Enum): class WindowsModule(ExtensionModule): def detect_compiler(self, compilers): - for l in ('c', 'cpp'): + for l in (Language.C, Language.CPP): if l in compilers: return compilers[l] raise MesonException('Resource compilation requires a C or C++ compiler.') |