From 663ac54e761bfa19c0a96fdbec73aca0d9fef41a Mon Sep 17 00:00:00 2001 From: Daniel Gryniewicz Date: Wed, 8 Feb 2017 11:44:53 -0500 Subject: [PATCH] cmake - Allow tests to build without NSS Without NSS, things that link radowsgw_a (including ceph_test_cephd_api_misc) needs SSL libs linked in. These are pulled in by civetweb. Signed-off-by: Daniel Gryniewicz --- src/rgw/CMakeLists.txt | 4 ++-- src/test/libcephd/CMakeLists.txt | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/rgw/CMakeLists.txt b/src/rgw/CMakeLists.txt index d48905b86aca0..febe22b075805 100644 --- a/src/rgw/CMakeLists.txt +++ b/src/rgw/CMakeLists.txt @@ -140,7 +140,7 @@ endif (WITH_RADOSGW_ASIO_FRONTEND) add_library(radosgw_a STATIC ${radosgw_srcs} $) -target_link_libraries(radosgw_a rgw_a) +target_link_libraries(radosgw_a rgw_a ${SSL_LIBRARIES}) add_executable(radosgw rgw_main.cc) target_link_libraries(radosgw radosgw_a librados @@ -148,7 +148,7 @@ target_link_libraries(radosgw radosgw_a librados cls_log_client cls_statelog_client cls_timeindex_client cls_version_client cls_replica_log_client cls_user_client global ${FCGI_LIBRARY} ${LIB_RESOLV} - ${CURL_LIBRARIES} ${EXPAT_LIBRARIES} ${SSL_LIBRARIES} ${BLKID_LIBRARIES} + ${CURL_LIBRARIES} ${EXPAT_LIBRARIES} ${BLKID_LIBRARIES} ${ALLOC_LIBS}) # radosgw depends on cls libraries at runtime, but not as link dependencies add_dependencies(radosgw cls_rgw cls_lock cls_refcount diff --git a/src/test/libcephd/CMakeLists.txt b/src/test/libcephd/CMakeLists.txt index 8aa253562c4b8..a12e8ea40c846 100644 --- a/src/test/libcephd/CMakeLists.txt +++ b/src/test/libcephd/CMakeLists.txt @@ -16,7 +16,7 @@ add_executable(ceph_test_cephd_api_misc set_target_properties(ceph_test_cephd_api_misc PROPERTIES COMPILE_FLAGS ${UNITTEST_CXX_FLAGS}) target_link_libraries(ceph_test_cephd_api_misc - cephd global ${UNITTEST_LIBS} cephdtest z snappy ceph_zstd) + cephd global ${UNITTEST_LIBS} cephdtest z snappy ceph_zstd) install(TARGETS ceph_test_cephd_api_misc -- 2.39.5