From: Casey Bodley <cbodley@redhat.com>
Date: Thu, 28 Apr 2022 15:43:15 +0000 (-0400)
Subject: cmake/rgw: add missing dependency on Arrow::Arrow
X-Git-Tag: v17.2.1~65^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F46144%2Fhead;p=ceph.git

cmake/rgw: add missing dependency on Arrow::Arrow

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)
---

diff --git a/src/rgw/CMakeLists.txt b/src/rgw/CMakeLists.txt
index faa7388a43f7..bee4cd0c9a42 100644
--- a/src/rgw/CMakeLists.txt
+++ b/src/rgw/CMakeLists.txt
@@ -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)