From b90f9f8073dea6fab8388972373d09a62bb1957d Mon Sep 17 00:00:00 2001 From: Jisi Liu Date: Tue, 25 Aug 2015 17:06:33 -0700 Subject: [PATCH] Update cmake and BUILD files. Change-Id: I17e16fdae6e4d2fb74d178fa5564a609ed58af1d --- BUILD | 12 +++++++++++- cmake/libprotobuf-lite.cmake | 1 + cmake/libprotobuf.cmake | 1 - 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/BUILD b/BUILD index 5cfed337e6..571f48b89d 100644 --- a/BUILD +++ b/BUILD @@ -35,11 +35,13 @@ cc_library( "src/google/protobuf/stubs/atomicops_internals_x86_msvc.cc", "src/google/protobuf/stubs/bytestream.cc", "src/google/protobuf/stubs/common.cc", + "src/google/protobuf/stubs/int128.cc", "src/google/protobuf/stubs/once.cc", "src/google/protobuf/stubs/status.cc", "src/google/protobuf/stubs/statusor.cc", "src/google/protobuf/stubs/stringpiece.cc", "src/google/protobuf/stubs/stringprintf.cc", + "src/google/protobuf/stubs/structurally_valid.cc", "src/google/protobuf/stubs/strutil.cc", "src/google/protobuf/stubs/time.cc", "src/google/protobuf/wire_format_lite.cc", @@ -80,13 +82,13 @@ cc_library( "src/google/protobuf/source_context.pb.cc", "src/google/protobuf/struct.pb.cc", "src/google/protobuf/stubs/mathlimits.cc", - "src/google/protobuf/stubs/structurally_valid.cc", "src/google/protobuf/stubs/substitute.cc", "src/google/protobuf/text_format.cc", "src/google/protobuf/timestamp.pb.cc", "src/google/protobuf/type.pb.cc", "src/google/protobuf/unknown_field_set.cc", "src/google/protobuf/util/field_comparator.cc", + "src/google/protobuf/util/field_mask_util.cc", "src/google/protobuf/util/internal/datapiece.cc", "src/google/protobuf/util/internal/default_value_objectwriter.cc", "src/google/protobuf/util/internal/error_listener.cc", @@ -102,6 +104,7 @@ cc_library( "src/google/protobuf/util/internal/utility.cc", "src/google/protobuf/util/json_util.cc", "src/google/protobuf/util/message_differencer.cc", + "src/google/protobuf/util/time_util.cc", "src/google/protobuf/util/type_resolver_util.cc", "src/google/protobuf/wire_format.cc", "src/google/protobuf/wrappers.pb.cc", @@ -180,6 +183,7 @@ cc_library( "src/google/protobuf/compiler/java/java_enum.cc", "src/google/protobuf/compiler/java/java_enum_field.cc", "src/google/protobuf/compiler/java/java_enum_field_lite.cc", + "src/google/protobuf/compiler/java/java_enum_lite.cc", "src/google/protobuf/compiler/java/java_extension.cc", "src/google/protobuf/compiler/java/java_field.cc", "src/google/protobuf/compiler/java/java_file.cc", @@ -258,6 +262,7 @@ LITE_TEST_PROTOS = [ "google/protobuf/unittest_import_lite.proto", "google/protobuf/unittest_import_public_lite.proto", "google/protobuf/unittest_lite.proto", + "google/protobuf/unittest_no_arena_lite.proto", ] TEST_PROTOS = [ @@ -278,6 +283,7 @@ TEST_PROTOS = [ "google/protobuf/unittest_import_public.proto", "google/protobuf/unittest_lite_imports_nonlite.proto", "google/protobuf/unittest_mset.proto", + "google/protobuf/unittest_mset_wire_format.proto", "google/protobuf/unittest_no_arena.proto", "google/protobuf/unittest_no_arena_import.proto", "google/protobuf/unittest_no_field_presence.proto", @@ -293,6 +299,7 @@ TEST_PROTOS = [ "google/protobuf/util/internal/testdata/default_value_test.proto", "google/protobuf/util/internal/testdata/field_mask.proto", "google/protobuf/util/internal/testdata/maps.proto", + "google/protobuf/util/internal/testdata/oneofs.proto", "google/protobuf/util/internal/testdata/struct.proto", "google/protobuf/util/internal/testdata/timestamp_duration.proto", "google/protobuf/util/json_format_proto3.proto", @@ -381,6 +388,7 @@ cc_test( "src/google/protobuf/repeated_field_unittest.cc", "src/google/protobuf/stubs/bytestream_unittest.cc", "src/google/protobuf/stubs/common_unittest.cc", + "src/google/protobuf/stubs/int128_unittest.cc", "src/google/protobuf/stubs/once_unittest.cc", "src/google/protobuf/stubs/status_test.cc", "src/google/protobuf/stubs/statusor_test.cc", @@ -394,6 +402,7 @@ cc_test( "src/google/protobuf/text_format_unittest.cc", "src/google/protobuf/unknown_field_set_unittest.cc", "src/google/protobuf/util/field_comparator_test.cc", + "src/google/protobuf/util/field_mask_util_test.cc", "src/google/protobuf/util/internal/default_value_objectwriter_test.cc", "src/google/protobuf/util/internal/json_objectwriter_test.cc", "src/google/protobuf/util/internal/json_stream_parser_test.cc", @@ -401,6 +410,7 @@ cc_test( "src/google/protobuf/util/internal/protostream_objectwriter_test.cc", "src/google/protobuf/util/internal/type_info_test_helper.cc", "src/google/protobuf/util/json_util_test.cc", + "src/google/protobuf/util/time_util_test.cc", "src/google/protobuf/util/type_resolver_util_test.cc", "src/google/protobuf/well_known_types_unittest.cc", "src/google/protobuf/wire_format_unittest.cc", diff --git a/cmake/libprotobuf-lite.cmake b/cmake/libprotobuf-lite.cmake index e2cec9d114..9fafc31676 100644 --- a/cmake/libprotobuf-lite.cmake +++ b/cmake/libprotobuf-lite.cmake @@ -18,6 +18,7 @@ set(libprotobuf_lite_files ${protobuf_source_dir}/src/google/protobuf/stubs/statusor.cc ${protobuf_source_dir}/src/google/protobuf/stubs/stringpiece.cc ${protobuf_source_dir}/src/google/protobuf/stubs/stringprintf.cc + ${protobuf_source_dir}/src/google/protobuf/stubs/structurally_valid.cc ${protobuf_source_dir}/src/google/protobuf/stubs/strutil.cc ${protobuf_source_dir}/src/google/protobuf/stubs/time.cc ${protobuf_source_dir}/src/google/protobuf/wire_format_lite.cc diff --git a/cmake/libprotobuf.cmake b/cmake/libprotobuf.cmake index f25e8c08a9..64a9cae01a 100644 --- a/cmake/libprotobuf.cmake +++ b/cmake/libprotobuf.cmake @@ -25,7 +25,6 @@ set(libprotobuf_files ${protobuf_source_dir}/src/google/protobuf/source_context.pb.cc ${protobuf_source_dir}/src/google/protobuf/struct.pb.cc ${protobuf_source_dir}/src/google/protobuf/stubs/mathlimits.cc - ${protobuf_source_dir}/src/google/protobuf/stubs/structurally_valid.cc ${protobuf_source_dir}/src/google/protobuf/stubs/substitute.cc ${protobuf_source_dir}/src/google/protobuf/text_format.cc ${protobuf_source_dir}/src/google/protobuf/timestamp.pb.cc