Install gtest from mason
This commit is contained in:
1
configure
vendored
1
configure
vendored
@@ -95,6 +95,7 @@ print_flags nunicode static_libs cflags ldflags
|
||||
print_flags libzip static_libs cflags ldflags
|
||||
print_flags variant static_libs cflags ldflags
|
||||
print_flags rapidjson static_libs cflags ldflags
|
||||
print_flags gtest static_libs cflags ldflags
|
||||
|
||||
CONFIG+=" }
|
||||
}
|
||||
|
||||
9592
deps/gtest/gtest-all.cc
vendored
9592
deps/gtest/gtest-all.cc
vendored
File diff suppressed because it is too large
Load Diff
28
deps/gtest/gtest.gyp
vendored
28
deps/gtest/gtest.gyp
vendored
@@ -1,28 +0,0 @@
|
||||
{
|
||||
'target_defaults': {
|
||||
'default_configuration': 'Release',
|
||||
'configurations': {
|
||||
'Debug': {},
|
||||
'Release': {}
|
||||
},
|
||||
},
|
||||
'targets': [{
|
||||
'target_name': 'gtest',
|
||||
'type': 'static_library',
|
||||
'sources': [
|
||||
'gtest-all.cc'
|
||||
],
|
||||
'xcode_settings': {
|
||||
'MACOSX_DEPLOYMENT_TARGET': '10.9',
|
||||
},
|
||||
'link_settings': {
|
||||
'xcode_settings': { 'OTHER_LDFLAGS': [ '-lpthread' ] },
|
||||
'ldflags': [ '-lpthread' ],
|
||||
},
|
||||
'direct_dependent_settings': {
|
||||
'include_dirs': [
|
||||
'.',
|
||||
],
|
||||
},
|
||||
}]
|
||||
}
|
||||
20061
deps/gtest/gtest/gtest.h
vendored
20061
deps/gtest/gtest/gtest.h
vendored
File diff suppressed because it is too large
Load Diff
@@ -13,6 +13,7 @@ NUNICODE_VERSION=1.5.1
|
||||
LIBZIP_VERSION=0.11.2
|
||||
VARIANT_VERSION=1.0
|
||||
RAPIDJSON_VERSION=1.0.2
|
||||
GTEST_VERSION=1.7.0
|
||||
|
||||
function print_opengl_flags {
|
||||
CONFIG+=" 'opengl_cflags%': $(quote_flags $(pkg-config gl x11 --cflags)),"$LN
|
||||
|
||||
@@ -13,3 +13,4 @@ NUNICODE_VERSION=1.5.1
|
||||
LIBZIP_VERSION=0.11.2
|
||||
VARIANT_VERSION=1.0
|
||||
RAPIDJSON_VERSION=1.0.2
|
||||
GTEST_VERSION=1.7.0
|
||||
|
||||
@@ -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)',
|
||||
],
|
||||
|
||||
Reference in New Issue
Block a user