aboutsummaryrefslogtreecommitdiff
path: root/cmake
diff options
context:
space:
mode:
authorJohn Millikin <john@john-millikin.com>2018-02-24 11:34:40 -0800
committerJohn Millikin <john@john-millikin.com>2018-02-24 11:34:40 -0800
commit724f0be33d0eb42055ebe81ce0c8c7bf88ea666c (patch)
tree8615d550cc10ded4aae36fbe13d7ee2840e8f5d5 /cmake
parenta6037c5230c0ccb6531f80cef909dbfe37257884 (diff)
downloadprotobuf-724f0be33d0eb42055ebe81ce0c8c7bf88ea666c.tar.gz
protobuf-724f0be33d0eb42055ebe81ce0c8c7bf88ea666c.tar.bz2
protobuf-724f0be33d0eb42055ebe81ce0c8c7bf88ea666c.zip
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.
Diffstat (limited to 'cmake')
-rw-r--r--cmake/libprotobuf.cmake1
-rw-r--r--cmake/libprotoc.cmake1
2 files changed, 1 insertions, 1 deletions
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