From 47dc509366162121a392651be81010235e8f5154 Mon Sep 17 00:00:00 2001 From: Pritha Srivastava Date: Mon, 13 Apr 2020 18:47:29 +0530 Subject: [PATCH] rgw: fix for make failure in test folder. Signed-off-by: Pritha Srivastava --- src/rgw/CMakeLists.txt | 5 ++--- src/test/CMakeLists.txt | 2 ++ 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/rgw/CMakeLists.txt b/src/rgw/CMakeLists.txt index ecddd7ec6a3..c07222a3f22 100644 --- a/src/rgw/CMakeLists.txt +++ b/src/rgw/CMakeLists.txt @@ -19,9 +19,6 @@ function(gperf_generate input output) ) endfunction() -include_directories(jwt-cpp PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}) -include_directories(picojson PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}) - set(librgw_common_srcs services/svc_finisher.cc services/svc_bi_rados.cc @@ -169,6 +166,7 @@ add_library(rgw_common OBJECT ${librgw_common_srcs}) target_include_directories(rgw_common SYSTEM PUBLIC "services") target_include_directories(rgw_common PUBLIC "${CMAKE_SOURCE_DIR}/src/dmclock/support/src") target_include_directories(rgw_common PUBLIC "${CMAKE_SOURCE_DIR}/src/fmt/include") +target_include_directories(rgw_common PUBLIC "${CMAKE_SOURCE_DIR}/src/rgw") if(WITH_BOOST_CONTEXT) target_include_directories(rgw_common PRIVATE @@ -227,6 +225,7 @@ add_dependencies(rgw_a civetweb_h) target_compile_definitions(rgw_a PUBLIC "-DCLS_CLIENT_HIDE_IOCTX") target_include_directories(rgw_a PUBLIC "${CMAKE_SOURCE_DIR}/src/dmclock/support/src") target_include_directories(rgw_a SYSTEM PUBLIC "../rapidjson/include") +target_include_directories(rgw_a SYSTEM PUBLIC "${CMAKE_SOURCE_DIR}/src/rgw") if(WITH_RADOSGW_AMQP_ENDPOINT) find_package(RabbitMQ REQUIRED) diff --git a/src/test/CMakeLists.txt b/src/test/CMakeLists.txt index 25a2f2436c4..6ff82579eb2 100644 --- a/src/test/CMakeLists.txt +++ b/src/test/CMakeLists.txt @@ -279,6 +279,7 @@ target_link_libraries(ceph_test_librgw_file_gp add_executable(ceph_test_librgw_file_nfsns librgw_file_nfsns.cc ) +target_include_directories(ceph_test_librgw_file_nfsns SYSTEM PRIVATE "${CMAKE_SOURCE_DIR}/src/rgw") if(WITH_RADOSGW_FCGI_FRONTEND) target_include_directories(ceph_test_librgw_file_nfsns SYSTEM PRIVATE ${FCGI_INCLUDE_DIR}) endif(WITH_RADOSGW_FCGI_FRONTEND) @@ -310,6 +311,7 @@ target_link_libraries(ceph_test_librgw_file_aw add_executable(ceph_test_librgw_file_marker librgw_file_marker.cc ) +target_include_directories(ceph_test_librgw_file_marker SYSTEM PRIVATE "${CMAKE_SOURCE_DIR}/src/rgw") target_link_libraries(ceph_test_librgw_file_marker rgw librados -- 2.39.5