Skip to content

meson: gate MSVC-isms on argument syntax, not compiler id #1090

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
NathanGray-ChurchillNavigation wants to merge 1 commit into
base: main
Choose a base branch
from
+2 −2
Open

meson: gate MSVC-isms on argument syntax, not compiler id #1090

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions meson.build
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ endif

build_shared = get_option('default_library') == 'shared'

if cc.get_id() == 'msvc'
if cc.get_argument_syntax() == 'msvc'
if build_shared
cc_export_define = '__declspec(dllexport) extern'
else
Expand Down Expand Up @@ -77,7 +77,7 @@ gudev_dep = dependency ('gudev-1.0', required: get_option('v4l2'))

aravis_public_dependencies = [glib_dep, gobject_dep, gio_dep]
aravis_dependencies = [aravis_public_dependencies, xml2_dep, libz_dep, gmodule_dep]
if cc.get_id()!='msvc'
if cc.get_argument_syntax()!='msvc'
libm = cc.find_library ('m', required: true)
aravis_dependencies += libm
endif
Expand Down
Loading