Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -59,12 +59,12 @@ jobs:
shell: bash
run: |
if [ "$RUNNER_OS" == "Linux" ]; then
sudo apt-get -y install make autoconf automake tar patch libtool gcc libthrift-dev
sudo apt-get -y install make autoconf automake tar patch libtool gcc
elif [ "$RUNNER_OS" == "Windows" ]; then
# choco install important_windows_software
echo "Nothing to install"
elif [ "$RUNNER_OS" == "macOS" ]; then
brew install autoconf automake libtool thrift
brew install autoconf automake libtool
else
echo "$RUNNER_OS not supported"
exit 1
Expand Down
16 changes: 16 additions & 0 deletions libraries.cmake/arrow.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,12 @@ else()
endif()
OPENMS_SMARTEXTRACT(ZIP_ARGS ARCHIVE_ARROW "ARROW" "README")

## Arrow dependencies not built by the contrib (Snappy, zstd, Thrift, xsimd, RapidJSON)
## are fetched and built as bundled dependencies by Arrow's own build system.
## This avoids requiring these as system packages (fixes build on e.g. Debian 12).
## Dependencies already provided by contrib (zlib, bzip2, boost) are found via CMAKE_PREFIX_PATH.
## Note: building Arrow requires internet access for the bundled dependency downloads.

## build the obj/lib
if (MSVC)
set(ARROW_CXXFLAGS "/I${PROJECT_BINARY_DIR}/include")
Expand All @@ -36,6 +42,11 @@ if (MSVC)
-D ARROW_WITH_BZIP2=ON
-D ARROW_WITH_ZSTD=ON
-D ARROW_WITH_SNAPPY=ON
-D Snappy_SOURCE=BUNDLED
-D zstd_SOURCE=BUNDLED
-D Thrift_SOURCE=BUNDLED
-D xsimd_SOURCE=BUNDLED
-D RapidJSON_SOURCE=BUNDLED
.
WORKING_DIRECTORY ${ARROW_DIR}
OUTPUT_VARIABLE ARROW_CMAKE_OUT
Expand Down Expand Up @@ -136,6 +147,11 @@ else() ## Linux/MacOS
"-DARROW_WITH_BZIP2=ON"
"-DARROW_WITH_ZSTD=ON"
"-DARROW_WITH_SNAPPY=ON"
"-DSnappy_SOURCE=BUNDLED"
"-Dzstd_SOURCE=BUNDLED"
"-DThrift_SOURCE=BUNDLED"
"-Dxsimd_SOURCE=BUNDLED"
"-DRapidJSON_SOURCE=BUNDLED"
.
WORKING_DIRECTORY ${ARROW_DIR}
OUTPUT_VARIABLE ARROW_CMAKE_OUT
Expand Down