From: Michael Vrable <vrable@cs.hmc.edu>
Date: Wed, 28 Oct 2015 04:12:47 +0000 (-0700)
Subject: Update kvstore sources for current protobuf compiler and boost libraries.
X-Git-Url: http://git.vrable.net/?p=bluesky.git;a=commitdiff_plain;h=2b939f6cfc203a821a190ffd8a42c610ad991505

Update kvstore sources for current protobuf compiler and boost libraries.
---

diff --git a/kvstore/CMakeLists.txt b/kvstore/CMakeLists.txt
index 20e5d75..155d804 100644
--- a/kvstore/CMakeLists.txt
+++ b/kvstore/CMakeLists.txt
@@ -10,13 +10,13 @@ add_library(kvclient SHARED
             kvclient.cc kvservice.cc backend.cc kvstore.pb.cc
             protobufrpc.cc socket_pool.cc workqueue.cc)
 target_link_libraries(kvclient
-                      boost_thread-mt boost_regex-mt boost_system-mt
-                      boost_program_options-mt db protobuf pthread)
+                      boost_thread boost_regex boost_system
+                      boost_program_options db protobuf pthread)
 
 target_link_libraries(kvstore
                       kvservice
-                      boost_thread-mt boost_regex-mt boost_system-mt
-                      boost_program_options-mt db protobuf protobufrpc pthread)
+                      boost_thread boost_regex boost_system
+                      boost_program_options db protobuf protobufrpc pthread)
 
 add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/kvstore.pb.cc
                           ${CMAKE_CURRENT_BINARY_DIR}/kvstore.pb.h
diff --git a/kvstore/kvstore.proto b/kvstore/kvstore.proto
index f90e296..5b616e6 100644
--- a/kvstore/kvstore.proto
+++ b/kvstore/kvstore.proto
@@ -1,3 +1,5 @@
+option cc_generic_services = true;
+
 package kvrpc;
 
 enum Result