Skip to content

Commit 380d1a6

Browse files
committed
build: fix gtest build for C++17
* Remove use of `tr1` namespace * Sync file list
1 parent 2d25fcf commit 380d1a6

File tree

2 files changed

+45
-6
lines changed

2 files changed

+45
-6
lines changed

deps/gtest/gtest.gyp

Lines changed: 34 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,22 @@
33
{
44
'target_name': 'gtest',
55
'type': 'static_library',
6-
'cflags': ['-Wno-missing-field-initializers'],
6+
'cflags': [
7+
'-Wno-missing-field-initializers',
8+
],
79
'direct_dependent_settings': {
8-
'include_dirs': ['include'],
10+
'include_dirs': [
11+
'include',
12+
],
913
},
10-
'include_dirs': ['.', 'include'],
14+
'defines': [
15+
'GTEST_LANG_CXX11=1',
16+
'GTEST_HAS_TR1_TUPLE=0',
17+
],
18+
'include_dirs': [
19+
'.',
20+
'include',
21+
],
1122
'sources': [
1223
'src/gtest-death-test.cc',
1324
'src/gtest-filepath.cc',
@@ -18,6 +29,26 @@
1829
'src/gtest-typed-test.cc',
1930
'src/gtest.cc',
2031
'src/gtest_main.cc',
32+
'include/gtest/internal/gtest-death-test-internal.h',
33+
'include/gtest/internal/gtest-filepath.h',
34+
'include/gtest/internal/gtest-internal.h',
35+
'include/gtest/internal/gtest-linked_ptr.h',
36+
'include/gtest/internal/gtest-param-util.h',
37+
'include/gtest/internal/gtest-param-util-generated.h',
38+
'include/gtest/internal/gtest-port.h',
39+
'include/gtest/internal/gtest-string.h',
40+
'include/gtest/internal/gtest-tuple.h',
41+
'include/gtest/internal/gtest-type-util.h',
42+
'include/gtest/gtest.h',
43+
'include/gtest/gtest-death-test.h',
44+
'include/gtest/gtest-message.h',
45+
'include/gtest/gtest-param-test.h',
46+
'include/gtest/gtest-printers.h',
47+
'include/gtest/gtest-spi.h',
48+
'include/gtest/gtest-test-part.h',
49+
'include/gtest/gtest-typed-test.h',
50+
'include/gtest/gtest_pred_impl.h',
51+
'include/gtest/gtest_prod.h',
2152
],
2253
}
2354
],

node.gyp

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -826,20 +826,28 @@
826826
'deps/uv/include',
827827
],
828828

829-
'defines': [ 'NODE_WANT_INTERNALS=1' ],
829+
'defines': [
830+
'NODE_WANT_INTERNALS=1',
831+
'GTEST_LANG_CXX11=1',
832+
'GTEST_HAS_TR1_TUPLE=0',
833+
],
830834

831835
'sources': [
832836
'test/cctest/node_test_fixture.cc',
833837
'test/cctest/test_aliased_buffer.cc',
834838
'test/cctest/test_base64.cc',
835-
'test/cctest/test_node_postmortem_metadata.cc',
836839
'test/cctest/test_environment.cc',
840+
# Listed here for completeness. Actual inclusion is conditional.
841+
# 'test/cctest/test_inspector_socket.cc',
842+
# 'test/cctest/test_inspector_socket_server.cc',
837843
'test/cctest/test_linked_binding.cc',
844+
'test/cctest/test_node_postmortem_metadata.cc',
838845
'test/cctest/test_platform.cc',
839846
'test/cctest/test_report_util.cc',
840847
'test/cctest/test_traced_value.cc',
848+
'test/cctest/test_url.cc',
841849
'test/cctest/test_util.cc',
842-
'test/cctest/test_url.cc'
850+
'test/cctest/node_test_fixture.h',
843851
],
844852

845853
'conditions': [

0 commit comments

Comments
 (0)