diff options
| author |  Jisi Liu <liujisi@google.com> | 2017-10-19 10:48:54 -0700 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2017-10-19 10:48:54 -0700 |
| commit | 07b9238a1c03ef0351bcb4ca57d773eb7b7c5824 (patch) | |
| tree | 21e26d76c08b02cdcffb944afb29916a59c182be /cmake | |
| parent | 9c407a16e4b64e8329da8508a56dd4ba260ebcd5 (diff) | |
| parent | 2ee294d80b8d6841bcd1149f62180bb18d671033 (diff) | |
Merge pull request #3770 from pherl/3.5-integrate
Integrate google internal changes for the up coming 3.5 release.
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/tests.cmake | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/cmake/tests.cmake b/cmake/tests.cmake index 389f6a7b..d4622c6b 100644 --- a/cmake/tests.cmake +++ b/cmake/tests.cmake @@ -121,6 +121,7 @@ set(tests_files ${protobuf_source_dir}/src/google/protobuf/any_test.cc ${protobuf_source_dir}/src/google/protobuf/arena_unittest.cc ${protobuf_source_dir}/src/google/protobuf/arenastring_unittest.cc + ${protobuf_source_dir}/src/google/protobuf/compiler/annotation_test_util.cc ${protobuf_source_dir}/src/google/protobuf/compiler/command_line_interface_unittest.cc ${protobuf_source_dir}/src/google/protobuf/compiler/cpp/cpp_bootstrap_unittest.cc ${protobuf_source_dir}/src/google/protobuf/compiler/cpp/cpp_move_unittest.cc |