In truth gtest is an external dependency that upstream expects you to
"vendor" into your own tree. As such, it makes sense to treat it more
like a dependency than an internal library, and collect it's
requirements together in a dependency object.
v2: - include with -isystem instead of setting compiler args (Eric)
Signed-off-by: Dylan Baker <dylanx.c.baker@intel.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
[files('tests/control_flow_tests.cpp'), nir_opcodes_h],
c_args : [c_vis_args, c_msvc_compat_args, no_override_init_args],
include_directories : [inc_common],
[files('tests/control_flow_tests.cpp'), nir_opcodes_h],
c_args : [c_vis_args, c_msvc_compat_args, no_override_init_args],
include_directories : [inc_common],
- dependencies : [dep_thread],
- link_with : [libmesa_util, libnir, libgtest],
+ dependencies : [dep_thread, idep_gtest],
+ link_with : [libmesa_util, libnir],
)
test('nir_control_flow', nir_control_flow_test)
)
test('nir_control_flow', nir_control_flow_test)
include_directories : include_directories('include'),
build_by_default : false,
)
include_directories : include_directories('include'),
build_by_default : false,
)
+
+idep_gtest = declare_dependency(
+ link_with : libgtest,
+ include_directories : include_directories('include', is_system : true),
+)
[t, nir_opcodes_h, ir_expression_operation_h],
'test_@0@.cpp'.format(t),
include_directories : [inc_common, inc_intel],
[t, nir_opcodes_h, ir_expression_operation_h],
'test_@0@.cpp'.format(t),
include_directories : [inc_common, inc_intel],
- link_with : [libgtest, libintel_compiler, libintel_common, libnir,
- libmesa_util, libisl],
- dependencies : [dep_thread, dep_dl],
+ link_with : [libintel_compiler, libintel_common, libnir, libmesa_util,
+ libisl],
+ dependencies : [dep_thread, dep_dl, idep_gtest],
)
test(t, _exe)
endforeach
)
test(t, _exe)
endforeach
string_buffer_test = executable(
'string_buffer_test',
'string_buffer_test.cpp',
string_buffer_test = executable(
'string_buffer_test',
'string_buffer_test.cpp',
- dependencies : [dep_thread, dep_dl],
+ dependencies : [dep_thread, dep_dl, idep_gtest],
include_directories : inc_common,
include_directories : inc_common,
- link_with : [libmesa_util, libgtest],
+ link_with : [libmesa_util],
)
test('string_buffer', string_buffer_test)
)
test('string_buffer', string_buffer_test)