From a590094f0532095890355dd42aac85078a39295a Mon Sep 17 00:00:00 2001 From: Kefu Chai Date: Thu, 19 May 2016 12:23:10 +0800 Subject: [PATCH] cmake: reuse secret.c's object library so we don't need to recompile it when using it. Signed-off-by: Kefu Chai --- src/CMakeLists.txt | 2 +- src/test/bench/CMakeLists.txt | 2 +- src/test/cls_rbd/CMakeLists.txt | 2 +- src/test/librbd/CMakeLists.txt | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 7833502fa5ea..cfccb67b079c 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -552,7 +552,7 @@ add_subdirectory(ceph-detect-init) set(dencoder_srcs test/encoding/ceph_dencoder.cc $ - common/secret.c + $ common/TextTable.cc ) if(${WITH_RADOSGW}) diff --git a/src/test/bench/CMakeLists.txt b/src/test/bench/CMakeLists.txt index 6af766275527..d1a903b61767 100644 --- a/src/test/bench/CMakeLists.txt +++ b/src/test/bench/CMakeLists.txt @@ -19,10 +19,10 @@ if (${WITH_RBD}) detailed_stat_collector.cc bencher.cc ${CMAKE_SOURCE_DIR}/src/common/TextTable.cc - ${CMAKE_SOURCE_DIR}/src/common/secret.c ) add_executable(ceph_smalliobenchrbd ${smalliobenchrbd_srcs} + $ ) target_link_libraries(ceph_smalliobenchrbd librbd diff --git a/src/test/cls_rbd/CMakeLists.txt b/src/test/cls_rbd/CMakeLists.txt index ac6029b8ea4f..65ada22255c2 100644 --- a/src/test/cls_rbd/CMakeLists.txt +++ b/src/test/cls_rbd/CMakeLists.txt @@ -2,7 +2,7 @@ add_executable(ceph_test_cls_rbd test_cls_rbd.cc ${CMAKE_SOURCE_DIR}/src/common/TextTable.cc - ${CMAKE_SOURCE_DIR}/src/common/secret.c + $ ) set_target_properties(ceph_test_cls_rbd PROPERTIES COMPILE_FLAGS ${UNITTEST_CXX_FLAGS}) diff --git a/src/test/librbd/CMakeLists.txt b/src/test/librbd/CMakeLists.txt index e51a96c1a525..0798a0be71a7 100644 --- a/src/test/librbd/CMakeLists.txt +++ b/src/test/librbd/CMakeLists.txt @@ -122,7 +122,7 @@ add_executable(ceph_test_librbd_fsx fsx.cc $ ${CMAKE_SOURCE_DIR}/src/common/TextTable.cc - ${CMAKE_SOURCE_DIR}/src/common/secret.c + $ ) target_link_libraries(ceph_test_librbd_fsx librbd -- 2.47.3