Skip to content

Commit 63c2efe

Browse files
authored
GH-46219: [C++][Parquet] Remove PARQUET_MINIMAL_DEPENDENCY option (#46274)
### Rationale for this change This option has been in our code base for some time but is not tested and may no longer work. The consensus in #46219 was to remove it. ### What changes are included in this PR? The option is removed! ### Are these changes tested? Yes (covered by the Parquet builds that had previously not tested this option!) ### Are there any user-facing changes? Yes, a build option was removed; however, I wasn't able to find where this build option was documented in the first place! * GitHub Issue: #46219 Authored-by: Dewey Dunnington <[email protected]> Signed-off-by: Dewey Dunnington <[email protected]>
1 parent 8d44eea commit 63c2efe

File tree

2 files changed

+16
-21
lines changed

2 files changed

+16
-21
lines changed

cpp/cmake_modules/DefineOptions.cmake

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -601,10 +601,6 @@ takes precedence over ccache if a storage backend is configured" ON)
601601
#----------------------------------------------------------------------
602602
set_option_category("Parquet")
603603

604-
define_option(PARQUET_MINIMAL_DEPENDENCY
605-
"Depend only on Thirdparty headers to build libparquet.;\
606-
Always OFF if building binaries" OFF)
607-
608604
define_option(PARQUET_BUILD_EXECUTABLES
609605
"Build the Parquet executable CLI tools. Requires static libraries to be built."
610606
OFF)

cpp/src/parquet/CMakeLists.txt

Lines changed: 16 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -258,24 +258,23 @@ else()
258258
set(PARQUET_SRCS ${PARQUET_SRCS} encryption/encryption_internal_nossl.cc)
259259
endif()
260260

261-
if(NOT PARQUET_MINIMAL_DEPENDENCY)
262-
list(APPEND PARQUET_SHARED_LINK_LIBS arrow_shared)
263-
264-
# Add RapidJSON libraries
265-
list(APPEND PARQUET_SHARED_PRIVATE_LINK_LIBS RapidJSON)
266-
list(APPEND PARQUET_STATIC_LINK_LIBS RapidJSON)
267-
268-
# These are libraries that we will link privately with parquet_shared (as they
269-
# do not need to be linked transitively by other linkers)
270-
list(APPEND PARQUET_SHARED_PRIVATE_LINK_LIBS thrift::thrift)
271-
272-
# Link publicly with parquet_static (because internal users need to
273-
# transitively link all dependencies)
274-
list(APPEND PARQUET_STATIC_LINK_LIBS thrift::thrift)
275-
if(NOT THRIFT_VENDORED)
276-
list(APPEND PARQUET_STATIC_INSTALL_INTERFACE_LIBS thrift::thrift)
277-
endif()
261+
list(APPEND PARQUET_SHARED_LINK_LIBS arrow_shared)
262+
263+
# Add RapidJSON libraries
264+
list(APPEND PARQUET_SHARED_PRIVATE_LINK_LIBS RapidJSON)
265+
list(APPEND PARQUET_STATIC_LINK_LIBS RapidJSON)
266+
267+
# These are libraries that we will link privately with parquet_shared (as they
268+
# do not need to be linked transitively by other linkers)
269+
list(APPEND PARQUET_SHARED_PRIVATE_LINK_LIBS thrift::thrift)
270+
271+
# Link publicly with parquet_static (because internal users need to
272+
# transitively link all dependencies)
273+
list(APPEND PARQUET_STATIC_LINK_LIBS thrift::thrift)
274+
if(NOT THRIFT_VENDORED)
275+
list(APPEND PARQUET_STATIC_INSTALL_INTERFACE_LIBS thrift::thrift)
278276
endif()
277+
279278
if(ARROW_WITH_OPENTELEMETRY)
280279
list(APPEND PARQUET_SHARED_PRIVATE_LINK_LIBS ${ARROW_OPENTELEMETRY_LIBS})
281280
endif()

0 commit comments

Comments
 (0)