Update kvstore sources for current protobuf compiler and boost libraries.

[bluesky.git] / kvstore / CMakeLists.txt

diff --git a/kvstore/CMakeLists.txt b/kvstore/CMakeLists.txt
index dc8b9cd..155d804 100644 (file)
--- a/kvstore/CMakeLists.txt
+++ b/kvstore/CMakeLists.txt
@@ -1,10 +1,3 @@
-add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/kvstore.pb.cc
-                          ${CMAKE_CURRENT_BINARY_DIR}/kvstore.pb.h
-                   COMMAND protoc --cpp_out=${CMAKE_CURRENT_BINARY_DIR}
-                                  --proto_path=${CMAKE_CURRENT_SOURCE_DIR}
-                                  ${CMAKE_CURRENT_SOURCE_DIR}/kvstore.proto
-                   DEPENDS kvstore.proto)
-
 include_directories(${CMAKE_CURRENT_BINARY_DIR})
 
 add_library(protobufrpc protobufrpc.cc socket_pool.cc workqueue.cc)
@@ -17,10 +10,18 @@ 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
+                   COMMAND protoc --cpp_out=${CMAKE_CURRENT_BINARY_DIR}
+                                  --proto_path=${CMAKE_CURRENT_SOURCE_DIR}
+                                  ${CMAKE_CURRENT_SOURCE_DIR}/kvstore.proto
+                   DEPENDS kvstore.proto)
+