summaryrefslogtreecommitdiffstats
path: root/src/util/tests
diff options
context:
space:
mode:
authorDylan Baker <[email protected]>2017-09-30 20:48:32 -0700
committerDylan Baker <[email protected]>2017-10-03 10:02:08 -0700
commit7a5a986ddd88487a42847f00f46f7bb0a542c988 (patch)
tree6e58782eac3b11dadf6287e68c93eb0286671d0c /src/util/tests
parent052c0d5edacf377a4b36cc9fee2945f8a9b38787 (diff)
meson: convert gtest to an internal dependency
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 <[email protected]> Reviewed-by: Eric Anholt <[email protected]>
Diffstat (limited to 'src/util/tests')
-rw-r--r--src/util/tests/string_buffer/meson.build4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/util/tests/string_buffer/meson.build b/src/util/tests/string_buffer/meson.build
index ea9b8a07dce..14dbebca7d8 100644
--- a/src/util/tests/string_buffer/meson.build
+++ b/src/util/tests/string_buffer/meson.build
@@ -21,9 +21,9 @@
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,
- link_with : [libmesa_util, libgtest],
+ link_with : [libmesa_util],
)
test('string_buffer', string_buffer_test)