Commit 212f601c authored by Seungha Yang's avatar Seungha Yang 🐑
Browse files

meson: Don't pass cpp_std=c++11 to MSVC

msvc cannot understand the compiler option.

WARNING: msvc does not support C++11; attempting best effort; setting the standard to C++14
cl : Command line warning D9002 : ignoring unknown option '/std:c++11'
parent d427b9bd
Pipeline #125832 passed with stages
in 35 minutes and 24 seconds
......@@ -154,6 +154,18 @@ if have_cxx and build_gstgl
endif
if have_qt_windowing
extra_options = []
# msvc doesn't understand /std:c++11.
# Note that the /std:[c++14|c++17|c++latest] option is available
# in Visual Studio 2017 or later
if cc.get_id() == 'msvc'
if cc.has_argument('/std:c++14')
extra_options = ['cpp_std=vc++14']
endif
else
extra_options = ['cpp_std=c++11']
endif
# Build it!
moc_files = qt5_mod.preprocess(moc_headers : moc_headers)
gstqmlgl = library('gstqmlgl', sources, moc_files,
......@@ -161,7 +173,7 @@ if have_cxx and build_gstgl
link_args : noseh_link_args,
include_directories: [configinc, libsinc],
dependencies : [glib_deps, gst_dep, gstvideo_dep, gstgl_dep, qt5qml_dep, optional_deps],
override_options : ['cpp_std=c++11'],
override_options : extra_options,
install: true,
install_dir : plugins_install_dir)
pkgconfig.generate(gstqmlgl, install_dir : plugins_pkgconfig_install_dir)
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment