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 numberDiff line numberDiff 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
Comment thread
AlenkaF marked this conversation as resolved.
PKG_CONFIG_NAME
SHARED_LINK_FLAGS
PRECOMPILED_HEADER_LIB)
PRECOMPILED_HEADER_LIB
SHARED_LINK_FLAGS)
set(multi_value_args
SOURCES
PRECOMPILED_HEADERS
Expand DownExpand 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 DownExpand 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 DownExpand 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 DownExpand 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 numberDiff line numberDiff 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 numberDiff line numberDiff line change
Expand Up@@ -32,7 +32,6 @@
};
# Also export C-level helpers
arrow_*;
pyarrow_*;
Comment thread
AlenkaF marked this conversation as resolved.
# 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

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 numberDiff line numberDiff 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
Comment thread
AlenkaF marked this conversation as resolved.

 PKG_CONFIG_NAME
SHARED_LINK_FLAGS
PRECOMPILED_HEADER_LIB)
PRECOMPILED_HEADER_LIB
SHARED_LINK_FLAGS)
 set(multi_value_args
 SOURCES
 PRECOMPILED_HEADERS
Expand DownExpand 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 DownExpand 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 DownExpand 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 DownExpand 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 numberDiff line numberDiff 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 numberDiff line numberDiff line change
Expand Up@@ -32,7 +32,6 @@
 };
 # Also export C-level helpers
 arrow_*;
 pyarrow_*;
Comment thread
AlenkaF marked this conversation as resolved.

 # 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

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 numberDiff line numberDiff 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
Comment thread
AlenkaF marked this conversation as resolved.

 PKG_CONFIG_NAME
SHARED_LINK_FLAGS
PRECOMPILED_HEADER_LIB)
PRECOMPILED_HEADER_LIB
SHARED_LINK_FLAGS)
 set(multi_value_args
 SOURCES
 PRECOMPILED_HEADERS
Expand DownExpand 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 DownExpand 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 DownExpand 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 DownExpand 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 numberDiff line numberDiff 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 numberDiff line numberDiff line change
Expand Up@@ -32,7 +32,6 @@
 };
 # Also export C-level helpers
 arrow_*;
 pyarrow_*;
Comment thread
AlenkaF marked this conversation as resolved.

 # 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

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 numberDiff line numberDiff 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
Comment thread
AlenkaF marked this conversation as resolved.

 PKG_CONFIG_NAME
SHARED_LINK_FLAGS
PRECOMPILED_HEADER_LIB)
PRECOMPILED_HEADER_LIB
SHARED_LINK_FLAGS)
 set(multi_value_args
 SOURCES
 PRECOMPILED_HEADERS
Expand DownExpand 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 DownExpand 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 DownExpand 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 DownExpand 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 numberDiff line numberDiff 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 numberDiff line numberDiff line change
Expand Up@@ -32,7 +32,6 @@
 };
 # Also export C-level helpers
 arrow_*;
 pyarrow_*;
Comment thread
AlenkaF marked this conversation as resolved.

 # 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

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 numberDiff line numberDiff 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
Comment thread
AlenkaF marked this conversation as resolved.

 PKG_CONFIG_NAME
SHARED_LINK_FLAGS
PRECOMPILED_HEADER_LIB)
PRECOMPILED_HEADER_LIB
SHARED_LINK_FLAGS)
 set(multi_value_args
 SOURCES
 PRECOMPILED_HEADERS
Expand DownExpand 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 DownExpand 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 DownExpand 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 DownExpand 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 numberDiff line numberDiff 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 numberDiff line numberDiff line change
Expand Up@@ -32,7 +32,6 @@
 };
 # Also export C-level helpers
 arrow_*;
 pyarrow_*;
Comment thread
AlenkaF marked this conversation as resolved.

 # 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

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 numberDiff line numberDiff 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
Comment thread
AlenkaF marked this conversation as resolved.

 PKG_CONFIG_NAME
SHARED_LINK_FLAGS
PRECOMPILED_HEADER_LIB)
PRECOMPILED_HEADER_LIB
SHARED_LINK_FLAGS)
 set(multi_value_args
 SOURCES
 PRECOMPILED_HEADERS
Expand DownExpand 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 DownExpand 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 DownExpand 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 DownExpand 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 numberDiff line numberDiff 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 numberDiff line numberDiff line change
Expand Up@@ -32,7 +32,6 @@
 };
 # Also export C-level helpers
 arrow_*;
 pyarrow_*;
Comment thread
AlenkaF marked this conversation as resolved.

 # 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

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 numberDiff line numberDiff 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
Comment thread
AlenkaF marked this conversation as resolved.

 PKG_CONFIG_NAME
SHARED_LINK_FLAGS
PRECOMPILED_HEADER_LIB)
PRECOMPILED_HEADER_LIB
SHARED_LINK_FLAGS)
 set(multi_value_args
 SOURCES
 PRECOMPILED_HEADERS
Expand DownExpand 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 DownExpand 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 DownExpand 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 DownExpand 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 numberDiff line numberDiff 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 numberDiff line numberDiff line change
Expand Up@@ -32,7 +32,6 @@
 };
 # Also export C-level helpers
 arrow_*;
 pyarrow_*;
Comment thread
AlenkaF marked this conversation as resolved.

 # 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

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 numberDiff line numberDiff 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
Comment thread
AlenkaF marked this conversation as resolved.

 PKG_CONFIG_NAME
SHARED_LINK_FLAGS
PRECOMPILED_HEADER_LIB)
PRECOMPILED_HEADER_LIB
SHARED_LINK_FLAGS)
 set(multi_value_args
 SOURCES
 PRECOMPILED_HEADERS
Expand DownExpand 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 DownExpand 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 DownExpand 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 DownExpand 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 numberDiff line numberDiff 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 numberDiff line numberDiff line change
Expand Up@@ -32,7 +32,6 @@
 };
 # Also export C-level helpers
 arrow_*;
 pyarrow_*;
Comment thread
AlenkaF marked this conversation as resolved.

 # 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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