Skip to content

Commit 34d9caf

Browse files
committed
libvmaf/test: fix link_with for Windows ci
1 parent 73cf287 commit 34d9caf

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

libvmaf/test/meson.build

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ test_picture = executable('test_picture',
2020
test_feature_collector = executable('test_feature_collector',
2121
['test.c', 'test_feature_collector.c', '../src/log.c'],
2222
include_directories : [libvmaf_inc, test_inc, include_directories('../src/feature/'), include_directories('../src')],
23-
link_with : libvmaf.get_static_lib(),
23+
link_with : get_option('default_library') == 'both' ? libvmaf.get_static_lib() : libvmaf,
2424
)
2525

2626
test_log = executable('test_log',
@@ -37,7 +37,7 @@ test_thread_pool = executable('test_thread_pool',
3737
test_model = executable('test_model',
3838
['test.c', 'test_model.c', '../src/dict.c', '../src/svm.cpp', '../src/pdjson.c', '../src/read_json_model.c', '../src/log.c', json_model_c_sources],
3939
include_directories : [libvmaf_inc, test_inc, include_directories('../src')],
40-
link_with : libvmaf.get_static_lib(),
40+
link_with : get_option('default_library') == 'both' ? libvmaf.get_static_lib() : libvmaf,
4141
c_args : vmaf_cflags_common,
4242
cpp_args : vmaf_cflags_common,
4343
dependencies : thread_lib,
@@ -48,7 +48,7 @@ test_predict = executable('test_predict',
4848
'../src/feature/feature_collector.c', '../src/feature/alias.c', '../src/model.c', '../src/svm.cpp', '../src/log.c',
4949
'../src/read_json_model.c', '../src/pdjson.c', json_model_c_sources, '../src/feature/feature_name.c', '../src/feature/feature_extractor.c'],
5050
include_directories : [libvmaf_inc, test_inc, include_directories('../src')],
51-
link_with : libvmaf.get_static_lib(),
51+
link_with : get_option('default_library') == 'both' ? libvmaf.get_static_lib() : libvmaf,
5252
c_args : vmaf_cflags_common,
5353
cpp_args : vmaf_cflags_common,
5454
dependencies : thread_lib,

0 commit comments

Comments
 (0)