Skip to content

Commit 3b04d01

Browse files
committed
Explicit S3 check before target. Reorder fix
1 parent 57f6da7 commit 3b04d01

2 files changed

Lines changed: 2 additions & 2 deletions

File tree

‎ci/scripts/cpp_test.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,8 +146,8 @@ if [ "${ARROW_USE_MESON:-OFF}" = "OFF" ] && \
146146
cmake \
147147
-S "${source_dir}/examples/minimal_build" \
148148
-B "${build_dir}/examples/minimal_build" \
149-
-DARROW_EXAMPLE_S3_STATIC_CHECK=ON \
150149
-DARROW_EXAMPLE_GCS_STATIC_CHECK=ON \
150+
-DARROW_EXAMPLE_S3_STATIC_CHECK=ON \
151151
-DCMAKE_PREFIX_PATH="${CMAKE_PREFIX_PATH}"
152152
cmake --build "${build_dir}/examples/minimal_build"
153153
pushd "${source_dir}/examples/minimal_build"

‎cpp/examples/minimal_build/CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ if(ARROW_EXAMPLE_GCS_STATIC_CHECK
8181
PRIVATE ARROW_EXAMPLE_GCS_STATIC_CHECK)
8282
target_link_libraries(arrow-example-gcs-static PRIVATE ArrowGcs::arrow_gcs_static)
8383

84-
if(TARGET ArrowS3::arrow_s3_static)
84+
if(ARROW_EXAMPLE_S3_STATIC_CHECK AND TARGET ArrowS3::arrow_s3_static)
8585
add_executable(arrow-example-s3-gcs-static example.cc)
8686
target_compile_definitions(arrow-example-s3-gcs-static
8787
PRIVATE ARROW_EXAMPLE_S3_STATIC_CHECK

0 commit comments

Comments
 (0)