Skip to content

ARROW-17838: [Python] Unify CMakeLists.txt in python/ #14925

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kou merged 13 commits into from
Dec 21, 2022
Merged

ARROW-17838: [Python] Unify CMakeLists.txt in python/ #14925

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
f3ba4d1
ARROW-17838: [Python] Unify CMakeLists.txt in python/
kou Dec 13, 2022
3d78438
Update release script
kou Dec 13, 2022
718f3c0
Fix lint
kou Dec 13, 2022
d9031ca
Use COMPILER_LAUNCHER for ccache
kou Dec 13, 2022
c155023
Fix Cython API
kou Dec 13, 2022
91a232e
Fix a typo
kou Dec 14, 2022
be2e41d
Fix install type for plasma-store-server
kou Dec 14, 2022
26bd09d
Fix a typo
kou Dec 14, 2022
b62a7ca
Fix a typo
kou Dec 14, 2022
66380ef
Fix a typo
kou Dec 14, 2022
5383800
Fix bundling
kou Dec 14, 2022
4522c17
Call find_package(Parquet REQUIRED) explicitly
kou Dec 16, 2022
75a7574
Add more ARROW_* checks
kou Dec 17, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 31 additions & 13 deletions cpp/cmake_modules/BuildUtils.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,9 +176,12 @@ function(ADD_ARROW_LIB LIB_NAME)
BUILD_SHARED
BUILD_STATIC
CMAKE_PACKAGE_NAME
INSTALL_ARCHIVE_DIR
INSTALL_LIBRARY_DIR
INSTALL_RUNTIME_DIR
PKG_CONFIG_NAME
SHARED_LINK_FLAGS
PRECOMPILED_HEADER_LIB)
PRECOMPILED_HEADER_LIB
SHARED_LINK_FLAGS)
set(multi_value_args
SOURCES
PRECOMPILED_HEADERS
Expand Down Expand Up @@ -258,7 +261,6 @@ function(ADD_ARROW_LIB LIB_NAME)
target_precompile_headers(${LIB_NAME}_objlib PRIVATE ${ARG_PRECOMPILED_HEADERS})
endif()
set(LIB_DEPS $<TARGET_OBJECTS:${LIB_NAME}_objlib>)
set(LIB_INCLUDES)
set(EXTRA_DEPS)

if(ARG_OUTPUTS)
Expand Down Expand Up @@ -287,13 +289,29 @@ function(ADD_ARROW_LIB LIB_NAME)
# TODO: add PCH directives
set(LIB_DEPS ${ARG_SOURCES})
set(EXTRA_DEPS ${ARG_DEPENDENCIES})
endif()

if(ARG_EXTRA_INCLUDES)
set(LIB_INCLUDES ${ARG_EXTRA_INCLUDES})
endif()
if(ARG_EXTRA_INCLUDES)
set(LIB_INCLUDES ${ARG_EXTRA_INCLUDES})
else()
set(LIB_INCLUDES "")
endif()

set(RUNTIME_INSTALL_DIR bin)
if(ARG_INSTALL_ARCHIVE_DIR)
set(INSTALL_ARCHIVE_DIR ${ARG_INSTALL_ARCHIVE_DIR})
else()
set(INSTALL_ARCHIVE_DIR ${CMAKE_INSTALL_LIBDIR})
endif()
if(ARG_INSTALL_LIBRARY_DIR)
set(INSTALL_LIBRARY_DIR ${ARG_INSTALL_LIBRARY_DIR})
else()
set(INSTALL_LIBRARY_DIR ${CMAKE_INSTALL_LIBDIR})
endif()
if(ARG_INSTALL_RUNTIME_DIR)
set(INSTALL_RUNTIME_DIR ${ARG_INSTALL_RUNTIME_DIR})
else()
set(INSTALL_RUNTIME_DIR bin)
endif()

if(BUILD_SHARED)
add_library(${LIB_NAME}_shared SHARED ${LIB_DEPS})
Expand Down Expand Up @@ -382,9 +400,9 @@ function(ADD_ARROW_LIB LIB_NAME)

install(TARGETS ${LIB_NAME}_shared ${INSTALL_IS_OPTIONAL}
EXPORT ${LIB_NAME}_targets
RUNTIME DESTINATION ${RUNTIME_INSTALL_DIR}
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
ARCHIVE DESTINATION ${INSTALL_ARCHIVE_DIR}
LIBRARY DESTINATION ${INSTALL_LIBRARY_DIR}
RUNTIME DESTINATION ${INSTALL_RUNTIME_DIR}
INCLUDES
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
endif()
Expand Down Expand Up @@ -453,9 +471,9 @@ function(ADD_ARROW_LIB LIB_NAME)

install(TARGETS ${LIB_NAME}_static ${INSTALL_IS_OPTIONAL}
EXPORT ${LIB_NAME}_targets
RUNTIME DESTINATION ${RUNTIME_INSTALL_DIR}
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
ARCHIVE DESTINATION ${INSTALL_ARCHIVE_DIR}
LIBRARY DESTINATION ${INSTALL_LIBRARY_DIR}
RUNTIME DESTINATION ${INSTALL_RUNTIME_DIR}
INCLUDES
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
endif()
Expand Down
2 changes: 1 addition & 1 deletion cpp/cmake_modules/UseCython.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ function(compile_pyx
get_source_file_property(property_is_public ${pyx_file} CYTHON_PUBLIC)
get_source_file_property(property_is_api ${pyx_file} CYTHON_API)
if(${property_is_api})
set(_generated_files "${output_file}" "${_name}.h" "${name}_api.h")
set(_generated_files "${output_file}" "${_name}.h" "${_name}_api.h")
elseif(${property_is_public})
set(_generated_files "${output_file}" "${_name}.h")
else()
Expand Down
1 change: 0 additions & 1 deletion cpp/src/arrow/symbols.map
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@
};
# Also export C-level helpers
arrow_*;
pyarrow_*;
# ARROW-14771: export Protobuf symbol table
descriptor_table_Flight_2eproto;
descriptor_table_FlightSql_2eproto;
Expand Down
6 changes: 3 additions & 3 deletions dev/release/01-prepare-test.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,10 +198,10 @@ def test_version_pre_tag
],
},
{
path: "python/pyarrow/src/CMakeLists.txt",
path: "python/CMakeLists.txt",
hunks: [
["-set(ARROW_PYTHON_VERSION \"#{@snapshot_version}\")",
"+set(ARROW_PYTHON_VERSION \"#{@release_version}\")"],
["-set(PYARROW_VERSION \"#{@snapshot_version}\")",
"+set(PYARROW_VERSION \"#{@release_version}\")"],
],
},
{
Expand Down
6 changes: 3 additions & 3 deletions dev/release/post-11-bump-versions-test.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,10 +145,10 @@ def test_version_post_tag
],
},
{
path: "python/pyarrow/src/CMakeLists.txt",
path: "python/CMakeLists.txt",
hunks: [
["-set(ARROW_PYTHON_VERSION \"#{@snapshot_version}\")",
"+set(ARROW_PYTHON_VERSION \"#{@next_snapshot_version}\")"],
["-set(PYARROW_VERSION \"#{@snapshot_version}\")",
"+set(PYARROW_VERSION \"#{@next_snapshot_version}\")"],
],
},
{
Expand Down
5 changes: 1 addition & 4 deletions dev/release/utils-prepare.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,11 +119,8 @@ update_versions() {
setup.py
rm -f setup.py.bak
git add setup.py
popd

pushd "${ARROW_DIR}/python/pyarrow/src"
sed -i.bak -E -e \
"s/^set\(ARROW_PYTHON_VERSION \".+\"\)/set(ARROW_PYTHON_VERSION \"${version}\")/" \
"s/^set\(PYARROW_VERSION \".+\"\)/set(PYARROW_VERSION \"${version}\")/" \
CMakeLists.txt
rm -f CMakeLists.txt.bak
git add CMakeLists.txt
Expand Down
Loading