Skip to content

Commit

Permalink
Remove static/shared CLI flag and use pkg-config
Browse files Browse the repository at this point in the history
  • Loading branch information
WillAyd committed Apr 2, 2024
1 parent 1e0d66c commit 58044bf
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 11 deletions.
2 changes: 0 additions & 2 deletions ci/scripts/build-with-meson.sh
Original file line number Diff line number Diff line change
Expand Up @@ -72,8 +72,6 @@ function main() {
meson wrap install nlohmann_json

show_header "Compile project with meson"
echo "Looking for Arrow in ${PKG_CONFIG_PATH}"
pkg-config --cflags --libs arrow
meson setup "${SANDBOX_DIR}" --pkg-config-path $PKG_CONFIG_PATH

pushd "${SANDBOX_DIR}"
Expand Down
3 changes: 0 additions & 3 deletions meson.options
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,6 @@ option('NANOARROW_BUNDLE_AS_CPP', type: 'boolean',
value: false)
option('NANOARROW_NAMESPACE', type: 'string',
description: 'A prefix for exported symbols')
option('NANOARROW_ARROW_STATIC', type: 'boolean',
description: 'Use a statically-linked Arrow C++ build when linking tests',
value: false)
option('NANOARROW_CODE_COVERAGE', type: 'boolean',
description: 'Enable coverage reporting',
value: false)
7 changes: 1 addition & 6 deletions src/nanoarrow/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -67,12 +67,7 @@ if get_option('NANOARROW_BUILD_TESTS')
# Similarly code coverage has a built in option users should use instead
# https://mesonbuild.com/Unit-tests.html#coverage

if get_option('NANOARROW_ARROW_STATIC')
arrow_dep = dependency('Arrow', modules: ['Arrow::arrow_static'])
else
arrow_dep = dependency('Arrow', modules: ['Arrow::arrow_shared'])
endif

arrow_dep = dependency('arrow')
gtest_dep = dependency('gtest', fallback: ['gtest', 'gtest_main_dep'])

# TODO: the CMake configuration sets a different C++ version depending on
Expand Down

0 comments on commit 58044bf

Please sign in to comment.