diff options
| author | Jisi Liu <jisi.liu@gmail.com> | 2016-01-29 13:51:05 -0800 |
|---|---|---|
| committer | Jisi Liu <jisi.liu@gmail.com> | 2016-01-29 13:51:05 -0800 |
| commit | 5221dcbe479ed765d8103ed7601c69b6d8d6ca4f (patch) | |
| tree | d48fed101cf2fc21e07d3034cc4e01c81f00bac2 /cmake | |
| parent | cb3f428810456dbb31211ed421401b90fb3b6586 (diff) | |
| download | protobuf-5221dcbe479ed765d8103ed7601c69b6d8d6ca4f.tar.gz protobuf-5221dcbe479ed765d8103ed7601c69b6d8d6ca4f.tar.bz2 protobuf-5221dcbe479ed765d8103ed7601c69b6d8d6ca4f.zip | |
Integrate from google internal.
Java files are moved to un-do the hack in the prevous commit, which
moved the java files to the original position for integration.
Diffstat (limited to '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 e70e453e..8df8986a 100644 --- a/cmake/libprotoc.cmake +++ b/cmake/libprotoc.cmake @@ -37,6 +37,7 @@ set(libprotoc_files ${protobuf_source_dir}/src/google/protobuf/compiler/java/java_enum_field_lite.cc ${protobuf_source_dir}/src/google/protobuf/compiler/java/java_enum_lite.cc ${protobuf_source_dir}/src/google/protobuf/compiler/java/java_extension.cc + ${protobuf_source_dir}/src/google/protobuf/compiler/java/java_extension_lite.cc ${protobuf_source_dir}/src/google/protobuf/compiler/java/java_field.cc ${protobuf_source_dir}/src/google/protobuf/compiler/java/java_file.cc ${protobuf_source_dir}/src/google/protobuf/compiler/java/java_generator.cc |