diff options
author | Adam Cozzette <acozzette@gmail.com> | 2016-11-23 11:26:31 -0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-11-23 11:26:31 -0800 |
commit | 39f9b43219bc5718b659ed72a2130a7b2ce66108 (patch) | |
tree | e48fe16afc2e1d868408e9453fff521d6ddcd4ae /cmake/libprotoc.cmake | |
parent | c9504715634948c9f8f306330449f296d926b74e (diff) | |
parent | 65479cb7b1f99ab957da68abce17feb68a9e1cf0 (diff) | |
download | protobuf-39f9b43219bc5718b659ed72a2130a7b2ce66108.tar.gz protobuf-39f9b43219bc5718b659ed72a2130a7b2ce66108.tar.bz2 protobuf-39f9b43219bc5718b659ed72a2130a7b2ce66108.zip |
Merge pull request #2403 from google/down-integrate-with-msvc-fix
Integrated internal changes from Google
Diffstat (limited to 'cmake/libprotoc.cmake')
-rw-r--r-- | cmake/libprotoc.cmake | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/cmake/libprotoc.cmake b/cmake/libprotoc.cmake index 71c3494c..2d238449 100644 --- a/cmake/libprotoc.cmake +++ b/cmake/libprotoc.cmake @@ -72,6 +72,7 @@ set(libprotoc_files ${protobuf_source_dir}/src/google/protobuf/compiler/javanano/javanano_message_field.cc ${protobuf_source_dir}/src/google/protobuf/compiler/javanano/javanano_primitive_field.cc ${protobuf_source_dir}/src/google/protobuf/compiler/js/js_generator.cc + ${protobuf_source_dir}/src/google/protobuf/compiler/js/well_known_types_embed.cc ${protobuf_source_dir}/src/google/protobuf/compiler/objectivec/objectivec_enum.cc ${protobuf_source_dir}/src/google/protobuf/compiler/objectivec/objectivec_enum_field.cc ${protobuf_source_dir}/src/google/protobuf/compiler/objectivec/objectivec_extension.cc |