From ddc4a8193e775d9cd9280ad7d9bb6975b4a323ee Mon Sep 17 00:00:00 2001 From: John Firebaugh Date: Wed, 30 Sep 2015 17:19:31 -0700 Subject: Install gtest from mason --- test/test.gypi | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'test') diff --git a/test/test.gypi b/test/test.gypi index 81302c874f..b581053d81 100644 --- a/test/test.gypi +++ b/test/test.gypi @@ -26,7 +26,6 @@ '../mbgl.gyp:asset-<(asset_lib)', '../mbgl.gyp:cache-<(cache_lib)', '../mbgl.gyp:headless-<(headless_lib)', - '../deps/gtest/gtest.gyp:gtest' ], 'sources': [ 'fixtures/main.cpp', @@ -93,11 +92,13 @@ 'style/sprite.cpp', ], 'libraries': [ + '<@(gtest_static_libs)', '<@(libuv_static_libs)', '<@(sqlite_static_libs)', ], 'variables': { 'cflags_cc': [ + '<@(gtest_cflags)', '<@(libuv_cflags)', '<@(opengl_cflags)', '<@(boost_cflags)', @@ -106,6 +107,7 @@ '<@(rapidjson_cflags)', ], 'ldflags': [ + '<@(gtest_ldflags)', '<@(libuv_ldflags)', '<@(sqlite_ldflags)', ], -- cgit v1.2.1