[VL] Link roaring in Velox test targets

Author: malinjawi

cpp/CMake/FindRoaring.cmake

@@ -150,12 +150,10 @@ if(Roaring_INCLUDE_DIR
 endif()
 
 if(_roaring_found_via_pkgconfig)
-  add_library(roaring INTERFACE)
-  target_link_libraries(roaring INTERFACE PkgConfig::Roaring)
-  _gluten_roaring_add_headers(roaring)
-  set(Roaring_FOUND TRUE)
-  message(STATUS "Found roaring via pkg-config imported target fallback.")
-  return()
+  message(
+    STATUS
+      "Found roaring via pkg-config without direct library; using FetchContent."
+  )
 endif()
 
 include(BuildRoaring)

cpp/velox/CMakeLists.txt

@@ -76,6 +76,7 @@ if(NOT DEFINED VELOX_BUILD_PATH)
 endif()
 
 find_package(Roaring REQUIRED)
+set(GLUTEN_ROARING_LINK_LIBRARY roaring)
 
 set(VELOX_PROTO_SRC_DIR
     ${GLUTEN_HOME}/backends-velox/src/main/resources/org/apache/gluten/proto)
@@ -326,7 +327,7 @@ endif()
 target_link_libraries(velox PUBLIC facebook::velox)
 
 target_link_libraries(velox PUBLIC Folly::folly)
-target_link_libraries(velox PUBLIC roaring)
+target_link_libraries(velox PUBLIC ${GLUTEN_ROARING_LINK_LIBRARY})
 
 find_re2()
 target_link_libraries(velox PUBLIC ${RE2_LIBRARY})

cpp/velox/compute/delta/tests/CMakeLists.txt

@@ -15,8 +15,9 @@
 
 add_executable(velox_roaring_bitmap_array_test RoaringBitmapArrayTest.cpp)
 
-target_link_libraries(velox_roaring_bitmap_array_test velox roaring
-                      GTest::gtest GTest::gtest_main)
+target_link_libraries(
+  velox_roaring_bitmap_array_test velox ${GLUTEN_ROARING_LINK_LIBRARY}
+  GTest::gtest GTest::gtest_main)
 
 add_test(
   NAME velox_roaring_bitmap_array_test

cpp/velox/tests/CMakeLists.txt

@@ -28,7 +28,8 @@ function(add_velox_test TEST_EXEC)
   add_executable(${TEST_EXEC} ${SOURCES} ${VELOX_TEST_COMMON_SRCS})
   target_include_directories(${TEST_EXEC} PRIVATE ${CMAKE_SOURCE_DIR}/velox
                                                   ${CMAKE_SOURCE_DIR}/src)
-  target_link_libraries(${TEST_EXEC} velox GTest::gtest GTest::gtest_main)
+  target_link_libraries(${TEST_EXEC} velox ${GLUTEN_ROARING_LINK_LIBRARY}
+                        GTest::gtest GTest::gtest_main)
   if(ENABLE_GPU)
     target_link_libraries(${TEST_EXEC} velox_curl)
   endif()
@@ -82,8 +83,9 @@ if(ENABLE_GPU)
              facebook::velox::velox_cudf_exec
              facebook::velox::velox_cudf_vector
              facebook::velox::velox_cudf_hive_connector)
-    target_link_libraries(${TEST_EXEC} PRIVATE velox cudf::cudf velox_curl
-                                               GTest::gtest GTest::gtest_main)
+    target_link_libraries(
+      ${TEST_EXEC} PRIVATE velox ${GLUTEN_ROARING_LINK_LIBRARY} cudf::cudf
+                           velox_curl GTest::gtest GTest::gtest_main)
     gtest_discover_tests(
       ${TEST_EXEC} DISCOVERY_MODE PRE_TEST
       PROPERTIES LABELS "cuda_driver"