Skip to content

Commit 8694db5

Browse files
majetideepakfacebook-github-bot
authored andcommitted
build: Remove unused libparquet targets from arrow CMake (#11987)
Summary: Pull Request resolved: #11987 Reviewed By: Yuhta, pedroerp Differential Revision: D67910242 Pulled By: kevinwilfong fbshipit-source-id: a7b4802cbf8f222d9379998a02f3ba7f7b01538f
1 parent 1442bd5 commit 8694db5

File tree

2 files changed

+5
-12
lines changed

2 files changed

+5
-12
lines changed

CMake/FindArrow.cmake

+2-5
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
# limitations under the License.
1414

1515
find_library(ARROW_LIB libarrow.a)
16-
find_library(PARQUET_LIB libparquet.a)
1716
find_library(ARROW_TESTING_LIB libarrow_testing.a)
1817
if("${ARROW_LIB}" STREQUAL "ARROW_LIB-NOTFOUND"
1918
OR "${ARROW_TESTING_LIB}" STREQUAL "ARROW_TESTING_LIB-NOTFOUND")
@@ -33,16 +32,14 @@ set(Arrow_FOUND true)
3332
# Only add the libraries once.
3433
if(NOT TARGET arrow)
3534
add_library(arrow STATIC IMPORTED GLOBAL)
36-
add_library(parquet STATIC IMPORTED GLOBAL)
3735
add_library(arrow_testing STATIC IMPORTED GLOBAL)
3836

3937
find_path(ARROW_INCLUDE_PATH arrow/api.h)
4038
set_target_properties(
41-
arrow arrow_testing parquet PROPERTIES INTERFACE_INCLUDE_DIRECTORIES
42-
${ARROW_INCLUDE_PATH})
39+
arrow arrow_testing PROPERTIES INTERFACE_INCLUDE_DIRECTORIES
40+
${ARROW_INCLUDE_PATH})
4341
set_target_properties(arrow PROPERTIES IMPORTED_LOCATION ${ARROW_LIB}
4442
INTERFACE_LINK_LIBRARIES thrift)
45-
set_target_properties(parquet PROPERTIES IMPORTED_LOCATION ${PARQUET_LIB})
4643
set_target_properties(arrow_testing PROPERTIES IMPORTED_LOCATION
4744
${ARROW_TESTING_LIB})
4845
endif()

CMake/resolve_dependency_modules/arrow/CMakeLists.txt

+3-7
Original file line numberDiff line numberDiff line change
@@ -71,27 +71,23 @@ if(VELOX_ENABLE_ARROW)
7171
URL_HASH ${VELOX_ARROW_BUILD_SHA256_CHECKSUM}
7272
SOURCE_SUBDIR cpp
7373
CMAKE_ARGS ${ARROW_CMAKE_ARGS}
74-
BUILD_BYPRODUCTS ${ARROW_LIBDIR}/libarrow.a ${ARROW_LIBDIR}/libparquet.a
74+
BUILD_BYPRODUCTS ${ARROW_LIBDIR}/libarrow.a
7575
${ARROW_LIBDIR}/libarrow_testing.a ${THRIFT_LIB}
7676
PATCH_COMMAND git apply ${CMAKE_CURRENT_LIST_DIR}/thrift-download.patch)
7777

7878
add_library(arrow STATIC IMPORTED GLOBAL)
7979
add_library(arrow_testing STATIC IMPORTED GLOBAL)
80-
add_library(parquet STATIC IMPORTED GLOBAL)
8180
add_dependencies(arrow arrow_ep)
8281
add_dependencies(arrow_testing arrow)
83-
add_dependencies(parquet arrow)
8482
file(MAKE_DIRECTORY ${ARROW_PREFIX}/install/include)
8583
set_target_properties(
86-
arrow arrow_testing parquet PROPERTIES INTERFACE_INCLUDE_DIRECTORIES
87-
${ARROW_PREFIX}/install/include)
84+
arrow arrow_testing PROPERTIES INTERFACE_INCLUDE_DIRECTORIES
85+
${ARROW_PREFIX}/install/include)
8886
set_target_properties(arrow PROPERTIES IMPORTED_LOCATION
8987
${ARROW_LIBDIR}/libarrow.a)
9088
set_property(TARGET arrow PROPERTY INTERFACE_LINK_LIBRARIES ${RE2} thrift)
9189
set_target_properties(
9290
arrow_testing PROPERTIES IMPORTED_LOCATION
9391
${ARROW_LIBDIR}/libarrow_testing.a)
94-
set_target_properties(parquet PROPERTIES IMPORTED_LOCATION
95-
${ARROW_LIBDIR}/libparquet.a)
9692

9793
endif()

0 commit comments

Comments
 (0)