From 946bf68f3b19c18eba4894b2f7da654cd68d749d Mon Sep 17 00:00:00 2001 From: jason Date: Thu, 14 Nov 2024 15:04:35 -0500 Subject: [PATCH] remove threads dep for windows --- lcm/meson.build | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/lcm/meson.build b/lcm/meson.build index b3305d45..682ee89b 100644 --- a/lcm/meson.build +++ b/lcm/meson.build @@ -1,5 +1,9 @@ +lcm_extra_deps = [] +lcm_c_args = [] + if unix thread_dep = dependency('threads') + lcm_extra_deps = [thread_dep] endif lcm_sources = ['eventlog.c', @@ -22,8 +26,6 @@ install_headers('eventlog.h', 'lcm_export.h', subdir : 'lcm') -lcm_extra_deps = [] -lcm_c_args = [] if windows lcm_sources += ['windows/WinLCM.cpp', 'windows/WinPorting.cpp'] install_headers('windows/WinPorting.h') @@ -32,16 +34,16 @@ if windows endif lcm_lib = both_libraries('lcm', lcm_sources, - dependencies : [glib_dep, thread_dep] + lcm_extra_deps, + dependencies : [glib_dep] + lcm_extra_deps, c_args : lcm_c_args, install : true) lcm_lib_dep = declare_dependency( link_with : lcm_lib.get_shared_lib(), - dependencies : [glib_dep, thread_dep] + lcm_extra_deps, + dependencies : [glib_dep] + lcm_extra_deps, include_directories : include_directories('..')) lcm_static_lib_dep = declare_dependency( link_with : lcm_lib.get_static_lib(), - dependencies : [glib_dep, thread_dep] + lcm_extra_deps, + dependencies : [glib_dep] + lcm_extra_deps, include_directories : include_directories('..')) lcm_coretypes_lib = declare_dependency() # 'lcm-coretypes'