Skip to content
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

Fix arrow libraries from download & build not being found in some cases #5366

Merged
merged 4 commits into from
Mar 1, 2024
Merged

Fix arrow libraries from download & build not being found in some cases #5366

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c79c9e7
trigger ci on .cmake changes
Wumpf Mar 1, 2024
656d199
Fix arrow libraries not being found in some cases
Wumpf Mar 1, 2024
9f2fa0c
okay, sometimes this variable doesn't exist?
Wumpf Mar 1, 2024
81bd42b
didn't work, let's force arrow's hand instead
Wumpf Mar 1, 2024
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
1 change: 1 addition & 0 deletions .github/workflows/on_pull_request.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ jobs:
- '**/*.hpp'
- '**/*.cpp'
- '**/CMakeLists.txt'
- '**/*cmake'

rust-checks:
name: "Rust Checks"
Expand Down
21 changes: 13 additions & 8 deletions rerun_cpp/download_and_build_arrow.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,16 +7,19 @@ function(download_and_build_arrow)

set(ARROW_DOWNLOAD_PATH ${CMAKE_BINARY_DIR}/arrow)

set(ARROW_LIB_PATH ${ARROW_DOWNLOAD_PATH}/lib)
set(ARROW_BIN_PATH ${ARROW_DOWNLOAD_PATH}/bin)

if(RERUN_ARROW_LINK_SHARED)
set(ARROW_BUILD_SHARED ON)
set(ARROW_BUILD_STATIC OFF)

if(APPLE)
set(ARROW_LIBRARY_FILE ${ARROW_DOWNLOAD_PATH}/lib/libarrow.dylib)
set(ARROW_LIBRARY_FILE ${ARROW_LIB_PATH}/libarrow.dylib)
elseif(UNIX) # if(LINUX) # CMake 3.25
set(ARROW_LIBRARY_FILE ${ARROW_DOWNLOAD_PATH}/lib/libarrow.so)
set(ARROW_LIBRARY_FILE ${ARROW_LIB_PATH}/libarrow.so)
elseif(WIN32)
set(ARROW_LIBRARY_FILE ${ARROW_DOWNLOAD_PATH}/bin/arrow.dll)
set(ARROW_LIBRARY_FILE ${ARROW_BIN_PATH}/arrow.dll)
else()
message(FATAL_ERROR "Unsupported platform.")
endif()
Expand All @@ -25,14 +28,14 @@ function(download_and_build_arrow)
set(ARROW_BUILD_STATIC ON)

if(APPLE)
set(ARROW_LIBRARY_FILE ${ARROW_DOWNLOAD_PATH}/lib/libarrow.a)
set(ARROW_LIBRARY_FILE ${ARROW_LIB_PATH}/libarrow.a)
set(ARROW_BUNDLED_DEPENDENCIES_FILE ${ARROW_DOWNLOAD_PATH}/lib/libarrow_bundled_dependencies.a)
elseif(UNIX) # if(LINUX) # CMake 3.25
set(ARROW_LIBRARY_FILE ${ARROW_DOWNLOAD_PATH}/lib/libarrow.a)
set(ARROW_BUNDLED_DEPENDENCIES_FILE ${ARROW_DOWNLOAD_PATH}/lib/libarrow_bundled_dependencies.a)
set(ARROW_LIBRARY_FILE ${ARROW_LIB_PATH}/libarrow.a)
set(ARROW_BUNDLED_DEPENDENCIES_FILE ${ARROW_LIB_PATH}/libarrow_bundled_dependencies.a)
elseif(WIN32)
set(ARROW_LIBRARY_FILE ${ARROW_DOWNLOAD_PATH}/lib/arrow_static.lib)
set(ARROW_BUNDLED_DEPENDENCIES_FILE ${ARROW_DOWNLOAD_PATH}/lib/arrow_bundled_dependencies.lib)
set(ARROW_LIBRARY_FILE ${ARROW_LIB_PATH}/arrow_static.lib)
set(ARROW_BUNDLED_DEPENDENCIES_FILE ${ARROW_LIB_PATH}/arrow_bundled_dependencies.lib)
else()
message(FATAL_ERROR "Unsupported platform.")
endif()
Expand Down Expand Up @@ -92,6 +95,8 @@ function(download_and_build_arrow)
-DARROW_USE_UBSAN=OFF
-DBOOST_SOURCE=BUNDLED
-DCMAKE_INSTALL_PREFIX=${ARROW_DOWNLOAD_PATH}
-DCMAKE_INSTALL_LIBDIR=lib
-DCMAKE_INSTALL_BINDIR=bin
-Dxsimd_SOURCE=BUNDLED
-DBOOST_SOURCE=BUNDLED
-DARROW_BOOST_USE_SHARED=OFF
Expand Down
Loading