projects
/
bluesky.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
fafdcad
)
More CMake tweaking.
author
Michael Vrable
<mvrable@cs.ucsd.edu>
Tue, 16 Feb 2010 23:29:08 +0000
(15:29 -0800)
committer
Michael Vrable
<mvrable@cs.ucsd.edu>
Tue, 16 Feb 2010 23:29:08 +0000
(15:29 -0800)
kvstore/CMakeLists.txt
patch
|
blob
|
history
diff --git
a/kvstore/CMakeLists.txt
b/kvstore/CMakeLists.txt
index
dc8b9cd
..
20e5d75
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)
include_directories(${CMAKE_CURRENT_BINARY_DIR})
add_library(protobufrpc protobufrpc.cc socket_pool.cc workqueue.cc)
@@
-24,3
+17,11
@@
target_link_libraries(kvstore
kvservice
boost_thread-mt boost_regex-mt boost_system-mt
boost_program_options-mt db protobuf protobufrpc pthread)
kvservice
boost_thread-mt boost_regex-mt boost_system-mt
boost_program_options-mt 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)
+