diff options
| author |  Bo Yang <teboring@google.com> | 2017-07-17 09:36:22 -0700 |
|---|---|---|
| committer | Bo Yang <teboring@google.com> | 2017-07-18 11:06:16 -0700 |
| commit | 6ec0b7e4d1fb606c6572a946e4eae97273367e67 (patch) | |
| tree | d983812539a3299ff130fff469140bdcd1bb1690 /cmake | |
| parent | 324b20a49170cb38d15ef243bc044026adb54ae1 (diff) | |
| parent | 5532abc15b97f3489183b266b41844306052a3fa (diff) | |
Merge 3.3.x into master
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/extract_includes.bat.in | 1 | ||||
| -rw-r--r-- | cmake/libprotobuf.cmake | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/cmake/extract_includes.bat.in b/cmake/extract_includes.bat.in index 1278ee87..1560a14b 100644 --- a/cmake/extract_includes.bat.in +++ b/cmake/extract_includes.bat.in @@ -50,6 +50,7 @@ copy "${PROTOBUF_SOURCE_WIN32_PATH}\..\src\google\protobuf\field_mask.pb.h" incl copy "${PROTOBUF_SOURCE_WIN32_PATH}\..\src\google\protobuf\generated_enum_reflection.h" include\google\protobuf\generated_enum_reflection.h copy "${PROTOBUF_SOURCE_WIN32_PATH}\..\src\google\protobuf\generated_enum_util.h" include\google\protobuf\generated_enum_util.h copy "${PROTOBUF_SOURCE_WIN32_PATH}\..\src\google\protobuf\generated_message_reflection.h" include\google\protobuf\generated_message_reflection.h +copy "${PROTOBUF_SOURCE_WIN32_PATH}\..\src\google\protobuf\generated_message_table_driven.h" include\google\protobuf\generated_message_table_driven.h copy "${PROTOBUF_SOURCE_WIN32_PATH}\..\src\google\protobuf\generated_message_util.h" include\google\protobuf\generated_message_util.h copy "${PROTOBUF_SOURCE_WIN32_PATH}\..\src\google\protobuf\generated_message_table_driven.h" include\google\protobuf\generated_message_table_driven.h copy "${PROTOBUF_SOURCE_WIN32_PATH}\..\src\google\protobuf\has_bits.h" include\google\protobuf\has_bits.h diff --git a/cmake/libprotobuf.cmake b/cmake/libprotobuf.cmake index 030924d2..72db915b 100644 --- a/cmake/libprotobuf.cmake +++ b/cmake/libprotobuf.cmake @@ -13,6 +13,7 @@ set(libprotobuf_files ${protobuf_source_dir}/src/google/protobuf/extension_set_heavy.cc ${protobuf_source_dir}/src/google/protobuf/field_mask.pb.cc ${protobuf_source_dir}/src/google/protobuf/generated_message_reflection.cc + ${protobuf_source_dir}/src/google/protobuf/generated_message_table_driven.cc ${protobuf_source_dir}/src/google/protobuf/io/gzip_stream.cc ${protobuf_source_dir}/src/google/protobuf/io/printer.cc ${protobuf_source_dir}/src/google/protobuf/io/strtod.cc |