Skip to content

Commit 3624db5

Browse files
committed
Meson: Some minor cleanups
We don't actually need to check for the /wd4828 compiler flag here, so stop checking for that. Move the '/utf-8' compiler flag check to be together with the other warning- related compiler flag checks.
1 parent 32c0f8a commit 3624db5

File tree

1 file changed

+1
-3
lines changed

1 file changed

+1
-3
lines changed

meson.build

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -223,8 +223,6 @@ endif
223223
msvc14x_toolset_ver = ''
224224

225225
if is_msvc
226-
add_project_arguments(cpp_compiler.get_supported_arguments([ '/utf-8', '/wd4828']), language: 'cpp')
227-
228226
if use_msvc14x_toolset_ver
229227
if cpp_compiler.version().version_compare('>=19.30')
230228
msvc14x_toolset_ver = '-vc143'
@@ -284,7 +282,7 @@ add_project_arguments(warning_flags, language: 'cpp')
284282
# MSVC: Ignore warnings that aren't really harmful, but make those
285283
# that should not be overlooked stand out.
286284
if is_msvc
287-
foreach wd : ['/FImsvc_recommended_pragmas.h', '/wd4267', '/EHsc' ]
285+
foreach wd : ['/FImsvc_recommended_pragmas.h', '/utf-8', '/wd4267', '/EHsc' ]
288286
disabled_warning = cpp_compiler.get_supported_arguments(wd)
289287
add_project_arguments(disabled_warning, language: 'cpp')
290288
endforeach

0 commit comments

Comments
 (0)