From 89153521136f9ba5e7d8db163019152c7dea5820 Mon Sep 17 00:00:00 2001 From: Thomas Newton Date: Sun, 23 Jul 2023 17:33:05 +0100 Subject: [PATCH] manylinux build fixes --- ci/scripts/python_wheel_manylinux_build.sh | 2 +- cpp/CMakeLists.txt | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/ci/scripts/python_wheel_manylinux_build.sh b/ci/scripts/python_wheel_manylinux_build.sh index d4fe652f7d32e..2f54a30a3f3f2 100755 --- a/ci/scripts/python_wheel_manylinux_build.sh +++ b/ci/scripts/python_wheel_manylinux_build.sh @@ -129,7 +129,7 @@ cmake \ -DCMAKE_UNITY_BUILD=${CMAKE_UNITY_BUILD} \ -DORC_PROTOBUF_EXECUTABLE=${VCPKG_ROOT}/installed/${VCPKG_TARGET_TRIPLET}/tools/protobuf/protoc \ -DORC_SOURCE=BUNDLED \ - -Dxml2_SOURCE=BUNDLED \ + -DLibXml2_SOURCE=BUNDLED \ -DPARQUET_REQUIRE_ENCRYPTION=${PARQUET_REQUIRE_ENCRYPTION} \ -DVCPKG_MANIFEST_MODE=OFF \ -DVCPKG_TARGET_TRIPLET=${VCPKG_TARGET_TRIPLET} \ diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt index c89fa7d70dba3..daa4f06126a42 100644 --- a/cpp/CMakeLists.txt +++ b/cpp/CMakeLists.txt @@ -798,6 +798,14 @@ endif() if(ARROW_AZURE) list(APPEND ARROW_SHARED_LINK_LIBS ${AZURESDK_LINK_LIBRARIES}) list(APPEND ARROW_STATIC_LINK_LIBS ${AZURESDK_LINK_LIBRARIES}) + if(AZURE_SDK_SOURCE STREQUAL "SYSTEM") + list(APPEND ARROW_STATIC_INSTALL_INTERFACE_LIBS + Azure::azure-core + Azure::azure-identity + Azure::azure-storage-blobs + Azure::azure-storage-common + Azure::azure-storage-files-datalake) + endif() endif() if(ARROW_WITH_UTF8PROC)