diff --git a/CMake/FindArrow.cmake b/CMake/FindArrow.cmake index 8c73a29e3913..cf80853ee209 100644 --- a/CMake/FindArrow.cmake +++ b/CMake/FindArrow.cmake @@ -13,7 +13,6 @@ # limitations under the License. find_library(ARROW_LIB libarrow.a) -find_library(PARQUET_LIB libparquet.a) find_library(ARROW_TESTING_LIB libarrow_testing.a) if("${ARROW_LIB}" STREQUAL "ARROW_LIB-NOTFOUND" OR "${ARROW_TESTING_LIB}" STREQUAL "ARROW_TESTING_LIB-NOTFOUND") @@ -33,16 +32,14 @@ set(Arrow_FOUND true) # Only add the libraries once. if(NOT TARGET arrow) add_library(arrow STATIC IMPORTED GLOBAL) - add_library(parquet STATIC IMPORTED GLOBAL) add_library(arrow_testing STATIC IMPORTED GLOBAL) find_path(ARROW_INCLUDE_PATH arrow/api.h) set_target_properties( - arrow arrow_testing parquet PROPERTIES INTERFACE_INCLUDE_DIRECTORIES - ${ARROW_INCLUDE_PATH}) + arrow arrow_testing PROPERTIES INTERFACE_INCLUDE_DIRECTORIES + ${ARROW_INCLUDE_PATH}) set_target_properties(arrow PROPERTIES IMPORTED_LOCATION ${ARROW_LIB} INTERFACE_LINK_LIBRARIES thrift) - set_target_properties(parquet PROPERTIES IMPORTED_LOCATION ${PARQUET_LIB}) set_target_properties(arrow_testing PROPERTIES IMPORTED_LOCATION ${ARROW_TESTING_LIB}) endif() diff --git a/CMake/resolve_dependency_modules/arrow/CMakeLists.txt b/CMake/resolve_dependency_modules/arrow/CMakeLists.txt index 90a61b7d912d..ed546a2878eb 100644 --- a/CMake/resolve_dependency_modules/arrow/CMakeLists.txt +++ b/CMake/resolve_dependency_modules/arrow/CMakeLists.txt @@ -71,27 +71,23 @@ if(VELOX_ENABLE_ARROW) URL_HASH ${VELOX_ARROW_BUILD_SHA256_CHECKSUM} SOURCE_SUBDIR cpp CMAKE_ARGS ${ARROW_CMAKE_ARGS} - BUILD_BYPRODUCTS ${ARROW_LIBDIR}/libarrow.a ${ARROW_LIBDIR}/libparquet.a + BUILD_BYPRODUCTS ${ARROW_LIBDIR}/libarrow.a ${ARROW_LIBDIR}/libarrow_testing.a ${THRIFT_LIB} PATCH_COMMAND git apply ${CMAKE_CURRENT_LIST_DIR}/thrift-download.patch) add_library(arrow STATIC IMPORTED GLOBAL) add_library(arrow_testing STATIC IMPORTED GLOBAL) - add_library(parquet STATIC IMPORTED GLOBAL) add_dependencies(arrow arrow_ep) add_dependencies(arrow_testing arrow) - add_dependencies(parquet arrow) file(MAKE_DIRECTORY ${ARROW_PREFIX}/install/include) set_target_properties( - arrow arrow_testing parquet PROPERTIES INTERFACE_INCLUDE_DIRECTORIES - ${ARROW_PREFIX}/install/include) + arrow arrow_testing PROPERTIES INTERFACE_INCLUDE_DIRECTORIES + ${ARROW_PREFIX}/install/include) set_target_properties(arrow PROPERTIES IMPORTED_LOCATION ${ARROW_LIBDIR}/libarrow.a) set_property(TARGET arrow PROPERTY INTERFACE_LINK_LIBRARIES ${RE2} thrift) set_target_properties( arrow_testing PROPERTIES IMPORTED_LOCATION ${ARROW_LIBDIR}/libarrow_testing.a) - set_target_properties(parquet PROPERTIES IMPORTED_LOCATION - ${ARROW_LIBDIR}/libparquet.a) endif()