File tree Expand file tree Collapse file tree 3 files changed +29
-14
lines changed
Expand file tree Collapse file tree 3 files changed +29
-14
lines changed Original file line number Diff line number Diff line change @@ -3366,10 +3366,6 @@ function(build_google_cloud_cpp_storage)
33663366 # List of dependencies taken from https://github.com/googleapis/google-cloud-cpp/blob/main/doc/packaging.md
33673367 build_crc32c_once ()
33683368
3369- # Curl is required on all platforms, but building it internally might also trip over S3's copy.
3370- # For now, force its inclusion from the underlying system or fail.
3371- find_curl ()
3372-
33733369 fetchcontent_declare (google_cloud_cpp
33743370 ${FC_DECLARE_COMMON_OPTIONS}
33753371 URL ${google_cloud_cpp_storage_SOURCE_URL}
@@ -3453,6 +3449,9 @@ if(ARROW_WITH_GOOGLE_CLOUD_CPP)
34533449 )
34543450 endif ()
34553451
3452+ # curl is required on all platforms. We always use system curl to
3453+ # avoid conflict.
3454+ find_curl ()
34563455 resolve_dependency (google_cloud_cpp_storage PC_PACKAGE_NAMES google_cloud_cpp_storage )
34573456 get_target_property (google_cloud_cpp_storage_INCLUDE_DIR google-cloud-cpp::storage
34583457 INTERFACE_INCLUDE_DIRECTORIES )
Original file line number Diff line number Diff line change @@ -162,11 +162,19 @@ if [ "${cmake_version_major}" -gt "3" ] || \
162162 [ " ${cmake_version_major} " -eq " 3" -a " ${cmake_version_minor} " -ge " 25" ]; then
163163 cp -a " ${TOP_SOURCE_DIR} /cpp/examples/minimal_build" build/
164164 pushd build/minimal_build
165- cmake .
166- make -j$( nproc)
167- ./arrow-example
168- c++ -o arrow-example example.cc $( pkg-config --cflags --libs arrow) -std=c++20
169- ./arrow-example
165+ cmake -S . -B build_shared
166+ make -C build_shared -j$( nproc)
167+ build_shared/arrow-example
168+ cmake -S . -B build_static -DARROW_LINK_SHARED=OFF
169+ make -C build_static -j$( nproc)
170+ build_static/arrow-example
171+ mkdir -p build_pkg_config
172+ c++ \
173+ example.cc \
174+ -o build_pkg_config/arrow-example \
175+ $( pkg-config --cflags --libs arrow) \
176+ -std=c++20
177+ build_pkg_config/arrow-example
170178 popd
171179fi
172180echo " ::endgroup::"
Original file line number Diff line number Diff line change @@ -191,11 +191,19 @@ if [ "${cmake_version_major}" -gt "3" ] || \
191191 [ " ${cmake_version_major} " -eq " 3" -a " ${cmake_version_minor} " -ge " 25" ]; then
192192 cp -a " ${TOP_SOURCE_DIR} /cpp/examples/minimal_build" build/
193193 pushd build/minimal_build
194- ${cmake_command} .
195- make -j$( nproc)
196- ./arrow-example
197- c++ -o arrow-example example.cc $( pkg-config --cflags --libs arrow) -std=c++2a
198- ./arrow-example
194+ cmake -S . -B build_shared
195+ make -C build_shared -j$( nproc)
196+ build_shared/arrow-example
197+ cmake -S . -B build_static -DARROW_LINK_SHARED=OFF
198+ make -C build_static -j$( nproc)
199+ build_static/arrow-example
200+ mkdir -p build_pkg_config
201+ c++ \
202+ example.cc \
203+ -o build_pkg_config/arrow-example \
204+ $( pkg-config --cflags --libs arrow) \
205+ -std=c++2a
206+ build_pkg_config/arrow-example
199207 popd
200208fi
201209echo " ::endgroup::"
You can’t perform that action at this time.
0 commit comments