organicmaps/harfbuzz
13
Fork 0
mirror of https://github.com/harfbuzz/harfbuzz.git synced 2025-04-05 13:35:06 +00:00
Code Issues 1 Projects Releases Wiki Activity Actions 9

fix warning when compiling with clang-cl

Browse source
This commit is contained in:
Elliot 2024-01-25 09:18:01 -05:00 • committed by Behdad Esfahbod
parent 4a18c502e2
commit 93a148cde6
1 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
meson.build
View file

@ -22,9 +22,16 @@ pkgmod = import('pkgconfig')
cpp = meson.get_compiler('cpp')
null_dep = dependency('', required: false)
# Enforce C++14 requirement for MSVC STL
if ['clang', 'clang-cl'].contains(cpp.get_id()) and cpp.get_define('_MSC_FULL_VER') != ''
add_project_arguments('-std=c++14', language: 'cpp')
# Only perform these checks if cpp_std is c++11 as setting -std directly
# produces a warning from meson.
if get_option('cpp_std') == 'c++11'
# Enforce C++14 requirement for MSVC STL
if cpp.get_id() == 'clang' and cpp.get_define('_MSC_FULL_VER') != ''
add_project_arguments('-std=c++14', language: 'cpp')
elif cpp.get_id() == 'clang-cl'
# Clang-cl produces a warning when using -std=c++14, but not when using /std:c++14
add_project_arguments('/std:c++14', language : 'cpp')
endif
endif
if cpp.get_argument_syntax() == 'msvc'