From d3134a3ed3674088e952813945bf1b7c9c4b73f8 Mon Sep 17 00:00:00 2001 From: Lzu Tao Date: Thu, 29 Nov 2018 01:26:41 +0700 Subject: [PATCH] Rename meson variables --- contrib/meson/meson.build | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/contrib/meson/meson.build b/contrib/meson/meson.build index 065c5e1b9..a8df86b85 100644 --- a/contrib/meson/meson.build +++ b/contrib/meson/meson.build @@ -86,14 +86,14 @@ lzma_dep = dependency('lzma', required: false) if cxx.get_id() == 'gcc' or cxx.get_id() == 'clang' common_flags = [ '-DXXH_NAMESPACE=ZSTD_' ] - zstd_compilation_flags = [ '-Wextra', '-Wundef', '-Wshadow', '-Wcast-align', '-Wcast-qual' ] - cc_common_flags = cc.get_supported_arguments(zstd_compilation_flags) - cc_common_flags += cc.get_supported_arguments(['-Wstrict-prototypes']) - cc_common_flags += common_flags - cxx_common_flags = cxx.get_supported_arguments(zstd_compilation_flags) - cxx_common_flags += common_flags - add_project_arguments(cc_common_flags, language : 'c') - add_project_arguments(cxx_common_flags, language : 'cpp') + common_warning_flags = [ '-Wextra', '-Wundef', '-Wshadow', '-Wcast-align', '-Wcast-qual' ] + cc_compilation_flags = cc.get_supported_arguments(common_warning_flags) + cc_compilation_flags += cc.get_supported_arguments(['-Wstrict-prototypes']) + cc_compilation_flags += common_flags + cxx_compilation_flags = cxx.get_supported_arguments(common_warning_flags) + cxx_compilation_flags += common_flags + add_project_arguments(cc_compilation_flags, language : 'c') + add_project_arguments(cxx_compilation_flags, language : 'cpp') endif # =============================================================================