Fix linked libs for arrow_compute

apache · Feb 28, 2025 · 98b4608 · 98b4608
1 parent 7240ca2
commit 98b4608
Showing 1 changed file with 22 additions and 13 deletions.
diff --git a/cpp/src/arrow/CMakeLists.txt b/cpp/src/arrow/CMakeLists.txt
@@ -801,20 +801,8 @@ if(ARROW_COMPUTE)
   append_runtime_avx2_src(ARROW_COMPUTE_LIB_SRCS compute/row/compare_internal_avx2.cc)
   append_runtime_avx2_src(ARROW_COMPUTE_LIB_SRCS compute/row/encode_internal_avx2.cc)
   append_runtime_avx2_bmi2_src(ARROW_COMPUTE_LIB_SRCS compute/util_avx2.cc)
-  # TODO: Some of those should be added conditionally
-  set(ARROW_COMPUTE_SHARED_PRIVATE_LINK_LIBS Boost::headers ${ARROW_XSIMD}
-                                             ${ARROW_OPENTELEMETRY_LIBS})
-  set(ARROW_COMPUTE_STATIC_LINK_LIBS Boost::headers ${ARROW_XSIMD}
-                                     ${ARROW_OPENTELEMETRY_LIBS})
-  if(ARROW_WITH_RE2)
-    list(APPEND ARROW_COMPUTE_SHARED_PRIVATE_LINK_LIBS re2::re2)
-    list(APPEND ARROW_COMPUTE_STATIC_LINK_LIBS re2::re2)
-  endif()
-  if(ARROW_WITH_UTF8PROC)
-    list(APPEND ARROW_COMPUTE_SHARED_PRIVATE_LINK_LIBS utf8proc::utf8proc)
-    list(APPEND ARROW_COMPUTE_STATIC_LINK_LIBS re2::re2)
-  endif()
 
+  set(ARROW_COMPUTE_SHARED_PRIVATE_LINK_LIBS)
   set(ARROW_COMPUTE_SHARED_LINK_LIBS)
   set(ARROW_COMPUTE_STATIC_LINK_LIBS)
   set(ARROW_COMPUTE_STATIC_INSTALL_INTERFACE_LIBS)
@@ -825,6 +813,27 @@ if(ARROW_COMPUTE)
   list(APPEND ARROW_COMPUTE_STATIC_LINK_LIBS arrow_static)
   list(APPEND ARROW_COMPUTE_SHARED_LINK_LIBS arrow_shared)
 
+  if(ARROW_USE_BOOST)
+    list(APPEND ARROW_COMPUTE_STATIC_LINK_LIBS Boost::headers)
+    list(APPEND ARROW_COMPUTE_SHARED_PRIVATE_LINK_LIBS Boost::headers)
+  endif()
+  if(ARROW_USE_XSIMD)
+    list(APPEND ARROW_COMPUTE_STATIC_LINK_LIBS ${ARROW_XSIMD})
+    list(APPEND ARROW_COMPUTE_SHARED_PRIVATE_LINK_LIBS ${ARROW_XSIMD})
+  endif()
+  if(ARROW_WITH_OPENTELEMETRY)
+    list(APPEND ARROW_COMPUTE_STATIC_LINK_LIBS ${ARROW_OPENTELEMETRY_LIBS})
+    list(APPEND ARROW_COMPUTE_SHARED_PRIVATE_LINK_LIBS ${ARROW_OPENTELEMETRY_LIBS})
+  endif()
+  if(ARROW_WITH_RE2)
+    list(APPEND ARROW_COMPUTE_STATIC_LINK_LIBS re2::re2)
+    list(APPEND ARROW_COMPUTE_SHARED_PRIVATE_LINK_LIBS re2::re2)
+  endif()
+  if(ARROW_WITH_UTF8PROC)
+    list(APPEND ARROW_COMPUTE_STATIC_LINK_LIBS utf8proc::utf8proc)
+    list(APPEND ARROW_COMPUTE_SHARED_PRIVATE_LINK_LIBS utf8proc::utf8proc)
+  endif()
+
   add_arrow_lib(arrow_compute
                 CMAKE_PACKAGE_NAME
                 ArrowCompute