]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
cmake/rgw: add missing dependency on Arrow::Arrow 46144/head
authorCasey Bodley <cbodley@redhat.com>
Thu, 28 Apr 2022 15:43:15 +0000 (11:43 -0400)
committerCasey Bodley <cbodley@redhat.com>
Wed, 4 May 2022 13:41:32 +0000 (09:41 -0400)
when WITH_SYSTEM_ARROW is disabled, BuildArrow.cmake creates an
Arrow::Parquet target that depends on Arrow::Arrow:

  target_link_libraries(Arrow::Parquet INTERFACE Arrow::Arrow)

but when WITH_SYSTEM_ARROW is enabled, the targets we get from
find_package() do not carry this dependency. so rgw's cmake needs to
depend on both targets

Fixes: https://tracker.ceph.com/issues/55420
Signed-off-by: Casey Bodley <cbodley@redhat.com>
(cherry picked from commit 3f12d21418963f2a33b124185a2842a9c39e9cfa)

src/rgw/CMakeLists.txt

index faa7388a43f776608f9347bc0b2516e13932cc08..bee4cd0c9a42f749856ba6e61a861f794027aaba 100644 (file)
@@ -4,7 +4,7 @@ if(NOT GPERF)
 endif()
 
 if(WITH_RADOSGW_SELECT_PARQUET)
-  set(ARROW_LIBRARIES Arrow::Parquet)
+  set(ARROW_LIBRARIES Arrow::Arrow Arrow::Parquet)
   add_definitions(-D_ARROW_EXIST)
   message("-- arrow is installed, radosgw/s3select-op is able to process parquet objects")
 endif(WITH_RADOSGW_SELECT_PARQUET)