diff options
| author |  Yuchen Zeng <zyc@google.com> | 2016-08-08 17:24:47 -0700 |
|---|---|---|
| committer | Yuchen Zeng <zyc@google.com> | 2016-08-08 17:24:47 -0700 |
| commit | 7a2c4d892740cb544513572e4070926cb5925da2 (patch) | |
| tree | 306f60317e972a9636b2299f94ec49be2908cdc5 /CMakeLists.txt | |
| parent | a418ed2ddbc5a520b02c60532593bcf796d97b74 (diff) | |
| parent | 50be893eba595a8cf270da3e59edd87128b854c9 (diff) | |
Merge remote-tracking branch 'upstream/master' into cares
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 81a6021d25..d6489ecc36 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1004,6 +1004,7 @@ add_library(grpc++ src/cpp/client/generic_stub.cc src/cpp/client/insecure_credentials.cc src/cpp/common/channel_arguments.cc + src/cpp/common/channel_filter.cc src/cpp/common/completion_queue.cc src/cpp/common/core_codegen.cc src/cpp/common/rpc_method.cc @@ -1259,6 +1260,7 @@ add_library(grpc++_unsecure src/cpp/client/generic_stub.cc src/cpp/client/insecure_credentials.cc src/cpp/common/channel_arguments.cc + src/cpp/common/channel_filter.cc src/cpp/common/completion_queue.cc src/cpp/common/core_codegen.cc src/cpp/common/rpc_method.cc |