From fe33c5fe9de57b010f5b47c5044d895ec813f92a Mon Sep 17 00:00:00 2001 From: Abdul Sami Date: Wed, 21 Feb 2018 12:17:55 +0500 Subject: Added instruction for existing ZLIB configuration Using two configuration flags `DZLIB_INCLUDE_DIR` and `DZLIB_LIB` we can locate an existing ZLIB on the system --- cmake/README.md | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'cmake') diff --git a/cmake/README.md b/cmake/README.md index 1e7410d8..305ebb88 100644 --- a/cmake/README.md +++ b/cmake/README.md @@ -302,6 +302,11 @@ further disable the option `-Dprotobuf_MSVC_STATIC_RUNTIME=OFF`. If it reports NOTFOUND for zlib_include or zlib_lib, you might haven't put the headers or the .lib file in the right directory. +If you already have ZLIB library and headers at some other location on your system then alternatively you can define following configuration flags to locate them: + + -DZLIB_INCLUDE_DIR= + -DZLIB_LIB= + Build and testing protobuf as usual. Notes on Compiler Warnings -- cgit v1.2.3 From 724f0be33d0eb42055ebe81ce0c8c7bf88ea666c Mon Sep 17 00:00:00 2001 From: John Millikin Date: Sat, 24 Feb 2018 11:34:40 -0800 Subject: Move `compiler/plugin.pb.cc` to libprotobuf with the other WKT sources. This lets all values of `WELL_KNOWN_PROTOS` be treated the same with regard to Bazel's protobuf blacklisting. --- BUILD | 2 +- cmake/libprotobuf.cmake | 1 + cmake/libprotoc.cmake | 1 - src/Makefile.am | 2 +- 4 files changed, 3 insertions(+), 3 deletions(-) (limited to 'cmake') diff --git a/BUILD b/BUILD index b786ff64..88d8b807 100644 --- a/BUILD +++ b/BUILD @@ -121,6 +121,7 @@ cc_library( "src/google/protobuf/api.pb.cc", "src/google/protobuf/compiler/importer.cc", "src/google/protobuf/compiler/parser.cc", + "src/google/protobuf/compiler/plugin.pb.cc", "src/google/protobuf/descriptor.cc", "src/google/protobuf/descriptor.pb.cc", "src/google/protobuf/descriptor_database.cc", @@ -378,7 +379,6 @@ cc_library( "src/google/protobuf/compiler/objectivec/objectivec_primitive_field.cc", "src/google/protobuf/compiler/php/php_generator.cc", "src/google/protobuf/compiler/plugin.cc", - "src/google/protobuf/compiler/plugin.pb.cc", "src/google/protobuf/compiler/python/python_generator.cc", "src/google/protobuf/compiler/ruby/ruby_generator.cc", "src/google/protobuf/compiler/subprocess.cc", diff --git a/cmake/libprotobuf.cmake b/cmake/libprotobuf.cmake index 65d05c19..173d2ab9 100644 --- a/cmake/libprotobuf.cmake +++ b/cmake/libprotobuf.cmake @@ -4,6 +4,7 @@ set(libprotobuf_files ${protobuf_source_dir}/src/google/protobuf/api.pb.cc ${protobuf_source_dir}/src/google/protobuf/compiler/importer.cc ${protobuf_source_dir}/src/google/protobuf/compiler/parser.cc + ${protobuf_source_dir}/src/google/protobuf/compiler/plugin.pb.cc ${protobuf_source_dir}/src/google/protobuf/descriptor.cc ${protobuf_source_dir}/src/google/protobuf/descriptor.pb.cc ${protobuf_source_dir}/src/google/protobuf/descriptor_database.cc diff --git a/cmake/libprotoc.cmake b/cmake/libprotoc.cmake index 5f6d078c..dbf52daf 100644 --- a/cmake/libprotoc.cmake +++ b/cmake/libprotoc.cmake @@ -88,7 +88,6 @@ set(libprotoc_files ${protobuf_source_dir}/src/google/protobuf/compiler/objectivec/objectivec_primitive_field.cc ${protobuf_source_dir}/src/google/protobuf/compiler/php/php_generator.cc ${protobuf_source_dir}/src/google/protobuf/compiler/plugin.cc - ${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/subprocess.cc diff --git a/src/Makefile.am b/src/Makefile.am index af2db52f..6eac2e15 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -278,6 +278,7 @@ libprotobuf_la_SOURCES = \ google/protobuf/io/zero_copy_stream_impl.cc \ google/protobuf/compiler/importer.cc \ google/protobuf/compiler/parser.cc \ + google/protobuf/compiler/plugin.pb.cc \ google/protobuf/util/delimited_message_util.cc \ google/protobuf/util/field_comparator.cc \ google/protobuf/util/field_mask_util.cc \ @@ -333,7 +334,6 @@ libprotoc_la_SOURCES = \ google/protobuf/compiler/code_generator.cc \ google/protobuf/compiler/command_line_interface.cc \ google/protobuf/compiler/plugin.cc \ - google/protobuf/compiler/plugin.pb.cc \ google/protobuf/compiler/subprocess.cc \ google/protobuf/compiler/subprocess.h \ google/protobuf/compiler/zip_writer.cc \ -- cgit v1.2.3 From fd595fcc93c949d6501a24f213633e007e93fb0c Mon Sep 17 00:00:00 2001 From: Feng Xiao Date: Thu, 1 Mar 2018 16:36:05 -0800 Subject: Revert "Move `compiler/plugin.pb.cc` to libprotobuf with the other WKT sources." This reverts commit 724f0be33d0eb42055ebe81ce0c8c7bf88ea666c. --- BUILD | 2 +- cmake/libprotobuf.cmake | 1 - cmake/libprotoc.cmake | 1 + src/Makefile.am | 2 +- 4 files changed, 3 insertions(+), 3 deletions(-) (limited to 'cmake') diff --git a/BUILD b/BUILD index ee81c759..7de6f407 100644 --- a/BUILD +++ b/BUILD @@ -121,7 +121,6 @@ cc_library( "src/google/protobuf/api.pb.cc", "src/google/protobuf/compiler/importer.cc", "src/google/protobuf/compiler/parser.cc", - "src/google/protobuf/compiler/plugin.pb.cc", "src/google/protobuf/descriptor.cc", "src/google/protobuf/descriptor.pb.cc", "src/google/protobuf/descriptor_database.cc", @@ -379,6 +378,7 @@ cc_library( "src/google/protobuf/compiler/objectivec/objectivec_primitive_field.cc", "src/google/protobuf/compiler/php/php_generator.cc", "src/google/protobuf/compiler/plugin.cc", + "src/google/protobuf/compiler/plugin.pb.cc", "src/google/protobuf/compiler/python/python_generator.cc", "src/google/protobuf/compiler/ruby/ruby_generator.cc", "src/google/protobuf/compiler/subprocess.cc", diff --git a/cmake/libprotobuf.cmake b/cmake/libprotobuf.cmake index 173d2ab9..65d05c19 100644 --- a/cmake/libprotobuf.cmake +++ b/cmake/libprotobuf.cmake @@ -4,7 +4,6 @@ set(libprotobuf_files ${protobuf_source_dir}/src/google/protobuf/api.pb.cc ${protobuf_source_dir}/src/google/protobuf/compiler/importer.cc ${protobuf_source_dir}/src/google/protobuf/compiler/parser.cc - ${protobuf_source_dir}/src/google/protobuf/compiler/plugin.pb.cc ${protobuf_source_dir}/src/google/protobuf/descriptor.cc ${protobuf_source_dir}/src/google/protobuf/descriptor.pb.cc ${protobuf_source_dir}/src/google/protobuf/descriptor_database.cc diff --git a/cmake/libprotoc.cmake b/cmake/libprotoc.cmake index dbf52daf..5f6d078c 100644 --- a/cmake/libprotoc.cmake +++ b/cmake/libprotoc.cmake @@ -88,6 +88,7 @@ set(libprotoc_files ${protobuf_source_dir}/src/google/protobuf/compiler/objectivec/objectivec_primitive_field.cc ${protobuf_source_dir}/src/google/protobuf/compiler/php/php_generator.cc ${protobuf_source_dir}/src/google/protobuf/compiler/plugin.cc + ${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/subprocess.cc diff --git a/src/Makefile.am b/src/Makefile.am index 6eac2e15..af2db52f 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -278,7 +278,6 @@ libprotobuf_la_SOURCES = \ google/protobuf/io/zero_copy_stream_impl.cc \ google/protobuf/compiler/importer.cc \ google/protobuf/compiler/parser.cc \ - google/protobuf/compiler/plugin.pb.cc \ google/protobuf/util/delimited_message_util.cc \ google/protobuf/util/field_comparator.cc \ google/protobuf/util/field_mask_util.cc \ @@ -334,6 +333,7 @@ libprotoc_la_SOURCES = \ google/protobuf/compiler/code_generator.cc \ google/protobuf/compiler/command_line_interface.cc \ google/protobuf/compiler/plugin.cc \ + google/protobuf/compiler/plugin.pb.cc \ google/protobuf/compiler/subprocess.cc \ google/protobuf/compiler/subprocess.h \ google/protobuf/compiler/zip_writer.cc \ -- cgit v1.2.3