]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #45818 from cbodley/wip-system-rapidjson
authorCasey Bodley <cbodley@users.noreply.github.com>
Fri, 9 Dec 2022 17:52:07 +0000 (12:52 -0500)
committerGitHub <noreply@github.com>
Fri, 9 Dec 2022 17:52:07 +0000 (12:52 -0500)
cmake: use rapidjson headers from s3select's submodule

Reviewed-by: Deepika Upadhyay <dupadhya@redhat.com>
Reviewed-by: Kefu Chai <tchaikov@gmail.com>
1  2 
src/rgw/CMakeLists.txt

index 8d663be01fb56af8eff591d38a19fcea08298c0c,d542062e2275926a300f271048c76f163b32f87d..e082de9d09a895bf821e236ff3f2354801040946
@@@ -356,10 -360,9 +357,9 @@@ add_library(rgw_a STATI
  target_compile_definitions(rgw_a PUBLIC "-DCLS_CLIENT_HIDE_IOCTX")
  
  target_include_directories(rgw_a
-   SYSTEM PUBLIC "../rapidjson/include"
    PUBLIC "${CMAKE_SOURCE_DIR}/src/dmclock/support/src"
    PUBLIC "${CMAKE_SOURCE_DIR}/src/rgw"
 -  PUBLIC "${CMAKE_SOURCE_DIR}/src/rgw/store/rados"
 +  PUBLIC "${CMAKE_SOURCE_DIR}/src/rgw/driver/rados"
    PRIVATE "${CMAKE_SOURCE_DIR}/src/libkmip")
  
  if(WITH_RADOSGW_AMQP_ENDPOINT)