diff options
| author | Feng Xiao <xfxyjwf@gmail.com> | 2018-08-08 17:00:41 -0700 |
|---|---|---|
| committer | Feng Xiao <xfxyjwf@gmail.com> | 2018-08-08 17:00:41 -0700 |
| commit | 6bbe197e9c1b6fc38cbdc45e3bf83fa7ced792a3 (patch) | |
| tree | e575738adf52d24b883cca5e8928a5ded31caba1 /cmake | |
| parent | e7746f487cb9cca685ffb1b3d7dccc5554b618a4 (diff) | |
| download | protobuf-6bbe197e9c1b6fc38cbdc45e3bf83fa7ced792a3.tar.gz protobuf-6bbe197e9c1b6fc38cbdc45e3bf83fa7ced792a3.tar.bz2 protobuf-6bbe197e9c1b6fc38cbdc45e3bf83fa7ced792a3.zip | |
Down-integrate from google3.
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/libprotoc.cmake | 3 | ||||
| -rw-r--r-- | cmake/tests.cmake | 2 |
2 files changed, 5 insertions, 0 deletions
diff --git a/cmake/libprotoc.cmake b/cmake/libprotoc.cmake index a9f5c36d..850a85a6 100644 --- a/cmake/libprotoc.cmake +++ b/cmake/libprotoc.cmake @@ -78,6 +78,7 @@ set(libprotoc_files ${protobuf_source_dir}/src/google/protobuf/compiler/plugin.pb.cc ${protobuf_source_dir}/src/google/protobuf/compiler/python/python_generator.cc ${protobuf_source_dir}/src/google/protobuf/compiler/ruby/ruby_generator.cc + ${protobuf_source_dir}/src/google/protobuf/compiler/scc.cc ${protobuf_source_dir}/src/google/protobuf/compiler/subprocess.cc ${protobuf_source_dir}/src/google/protobuf/compiler/zip_writer.cc ) @@ -153,6 +154,7 @@ set(libprotoc_headers ${protobuf_source_dir}/src/google/protobuf/compiler/objectivec/objectivec_message_field.h ${protobuf_source_dir}/src/google/protobuf/compiler/objectivec/objectivec_oneof.h ${protobuf_source_dir}/src/google/protobuf/compiler/objectivec/objectivec_primitive_field.h + ${protobuf_source_dir}/src/google/protobuf/compiler/scc.h ${protobuf_source_dir}/src/google/protobuf/compiler/subprocess.h ${protobuf_source_dir}/src/google/protobuf/compiler/zip_writer.h ) @@ -177,3 +179,4 @@ set_target_properties(libprotoc PROPERTIES OUTPUT_NAME ${LIB_PREFIX}protoc DEBUG_POSTFIX "${protobuf_DEBUG_POSTFIX}") add_library(protobuf::libprotoc ALIAS libprotoc) + diff --git a/cmake/tests.cmake b/cmake/tests.cmake index f91567b8..b77a5ebe 100644 --- a/cmake/tests.cmake +++ b/cmake/tests.cmake @@ -63,6 +63,7 @@ set(tests_protos google/protobuf/unittest_optimize_for.proto google/protobuf/unittest_preserve_unknown_enum.proto google/protobuf/unittest_preserve_unknown_enum2.proto + google/protobuf/unittest_proto3.proto google/protobuf/unittest_proto3_arena.proto google/protobuf/unittest_proto3_arena_lite.proto google/protobuf/unittest_proto3_lite.proto @@ -78,6 +79,7 @@ set(tests_protos google/protobuf/util/internal/testdata/struct.proto google/protobuf/util/internal/testdata/timestamp_duration.proto google/protobuf/util/internal/testdata/wrappers.proto + google/protobuf/util/json_format.proto google/protobuf/util/json_format_proto3.proto google/protobuf/util/message_differencer_unittest.proto ) |