apacheGH-35018: [CI][Java][C++] Use ARROW_ZSTD_USE_SHARED=OFF for LLVM (

apache#35023) ### Rationale for this change LLVM may use Zstandard. For example `llvm@ 15` in Homebrew uses Zstandard. LLVM finds Zstandared by itself. So libzstd.dylib may be used even when `ARROW_ZSTD_USE_SHARED` is `OFF`. ### What changes are included in this PR? This change adjusts Zstandared used by LLVM to reflect `ARROW_ZSTD_USE_SHARED`. ### Are these changes tested? Yes. ### Are there any user-facing changes? Yes. * Closes: apache#35018 Authored-by: Sutou Kouhei <[email protected]> Signed-off-by: Sutou Kouhei <[email protected]>
rtpsw · May 16, 2023 · 8737445 · 8737445
1 parent a334a06
commit 8737445
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 0 deletions.
diff --git a/cpp/cmake_modules/FindLLVMAlt.cmake b/cpp/cmake_modules/FindLLVMAlt.cmake
@@ -96,6 +96,21 @@ if(LLVM_FOUND)
   add_library(LLVM::LLVM_LIBS INTERFACE IMPORTED)
   set_target_properties(LLVM::LLVM_LIBS PROPERTIES INTERFACE_LINK_LIBRARIES
                                                    "${LLVM_LIBS}")
+
+  if(TARGET LLVMSupport AND NOT ARROW_ZSTD_USE_SHARED)
+    get_target_property(LLVM_SUPPORT_INTERFACE_LINK_LIBRARIES LLVMSupport
+                        INTERFACE_LINK_LIBRARIES)
+    list(FIND LLVM_SUPPORT_INTERFACE_LINK_LIBRARIES zstd::libzstd_shared
+         LLVM_SUPPORT_LIBZSTD_INDEX)
+    if(NOT LLVM_SUPPORT_LIBZSTD_INDEX EQUAL -1)
+      list(REMOVE_AT LLVM_SUPPORT_INTERFACE_LINK_LIBRARIES ${LLVM_SUPPORT_LIBZSTD_INDEX})
+      list(INSERT LLVM_SUPPORT_INTERFACE_LINK_LIBRARIES ${LLVM_SUPPORT_LIBZSTD_INDEX}
+           zstd::libzstd_static)
+    endif()
+    set_target_properties(LLVMSupport
+                          PROPERTIES INTERFACE_LINK_LIBRARIES
+                                     "${LLVM_SUPPORT_INTERFACE_LINK_LIBRARIES}")
+  endif()
 endif()
 
 mark_as_advanced(CLANG_EXECUTABLE LLVM_LINK_EXECUTABLE)

diff --git a/cpp/src/gandiva/CMakeLists.txt b/cpp/src/gandiva/CMakeLists.txt
@@ -27,6 +27,9 @@ add_dependencies(gandiva-all gandiva gandiva-tests gandiva-benchmarks)
 
 find_package(LLVMAlt REQUIRED)
 provide_find_module(LLVMAlt "Gandiva")
+if(ARROW_WITH_ZSTD)
+  provide_find_module(zstdAlt "Gandiva")
+endif()
 
 add_definitions(-DGANDIVA_LLVM_VERSION=${LLVM_VERSION_MAJOR})
 

diff --git a/cpp/src/gandiva/GandivaConfig.cmake.in b/cpp/src/gandiva/GandivaConfig.cmake.in
@@ -36,6 +36,9 @@ else()
   unset(GANDIVA_CMAKE_MODULE_PATH_OLD)
 endif()
 set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}")
+if(ARROW_WITH_ZSTD)
+  find_dependency(zstdAlt)
+endif()
 find_dependency(LLVMAlt)
 if(DEFINED GANDIVA_CMAKE_MODULE_PATH_OLD)
   set(CMAKE_MODULE_PATH ${GANDIVA_CMAKE_MODULE_PATH_OLD})