diff --git a/ci/scripts/build-with-meson.sh b/ci/scripts/build-with-meson.sh index 9d5874c4e..027a557ac 100755 --- a/ci/scripts/build-with-meson.sh +++ b/ci/scripts/build-with-meson.sh @@ -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}" diff --git a/meson.options b/meson.options index cab592ec5..fe8d5ce8b 100644 --- a/meson.options +++ b/meson.options @@ -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) diff --git a/src/nanoarrow/meson.build b/src/nanoarrow/meson.build index 5a2cd15f9..4766663e3 100644 --- a/src/nanoarrow/meson.build +++ b/src/nanoarrow/meson.build @@ -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