From 525a279a18f299b329489bdc376697fdcd5f281c Mon Sep 17 00:00:00 2001 From: Tao He Date: Sat, 24 Oct 2020 22:48:31 +0800 Subject: [PATCH] Install target etcd-cpp-api where it is defined. Signed-off-by: Tao He --- CMakeLists.txt | 9 --------- src/CMakeLists.txt | 10 ++++++++++ 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 3dbcc7a..92c6e35 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -56,15 +56,6 @@ if (BUILD_ETCD_TESTS) add_subdirectory(tst) endif () -install (TARGETS etcd-cpp-api DESTINATION lib) -install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/etcd/Client.hpp - ${CMAKE_CURRENT_SOURCE_DIR}/etcd/SyncClient.hpp - ${CMAKE_CURRENT_SOURCE_DIR}/etcd/Response.hpp - ${CMAKE_CURRENT_SOURCE_DIR}/etcd/Value.hpp - ${CMAKE_CURRENT_SOURCE_DIR}/etcd/Watcher.hpp - DESTINATION include/etcd) -install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/etcd/v3/Transaction.hpp - DESTINATION include/etcd/v3) install (FILES ${CMAKE_CURRENT_BINARY_DIR}/proto/gen/proto/auth.pb.h ${CMAKE_CURRENT_BINARY_DIR}/proto/gen/proto/kv.pb.h ${CMAKE_CURRENT_BINARY_DIR}/proto/gen/proto/rpc.pb.h diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index cc6bfa6..5de249c 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -16,3 +16,13 @@ target_link_libraries(etcd-cpp-api PUBLIC ${GRPC_LIBRARIES}) target_include_directories(etcd-cpp-api PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/../proto/gen) target_include_directories(etcd-cpp-api PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/../proto/gen/proto) + +install (TARGETS etcd-cpp-api DESTINATION lib) +install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/etcd/Client.hpp + ${CMAKE_CURRENT_SOURCE_DIR}/etcd/SyncClient.hpp + ${CMAKE_CURRENT_SOURCE_DIR}/etcd/Response.hpp + ${CMAKE_CURRENT_SOURCE_DIR}/etcd/Value.hpp + ${CMAKE_CURRENT_SOURCE_DIR}/etcd/Watcher.hpp + DESTINATION include/etcd) +install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/etcd/v3/Transaction.hpp + DESTINATION include/etcd/v3)