vcpkg libxml2

Tom-Newton · Aug 10, 2023 · 0cbd6e9 · 0cbd6e9
1 parent 525a87c
commit 0cbd6e9
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 13 deletions.
diff --git a/ci/scripts/python_wheel_manylinux_build.sh b/ci/scripts/python_wheel_manylinux_build.sh
@@ -125,7 +125,6 @@ cmake \
     -DCMAKE_UNITY_BUILD=${CMAKE_UNITY_BUILD} \
     -DORC_PROTOBUF_EXECUTABLE=${VCPKG_ROOT}/installed/${VCPKG_TARGET_TRIPLET}/tools/protobuf/protoc \
     -DORC_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
@@ -798,14 +798,6 @@ 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)

diff --git a/cpp/cmake_modules/ThirdpartyToolchain.cmake b/cpp/cmake_modules/ThirdpartyToolchain.cmake
@@ -5256,10 +5256,18 @@ macro(build_azuresdk)
 endmacro()
 
 if(ARROW_AZURE)
-  resolve_dependency(AZURE_SDK)
-
-  message(STATUS "Found Azure SDK headers: ${AZURESDK_INCLUDE_DIR}")
-  message(STATUS "Found Azure SDK libraries: ${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)
+  else()
+    resolve_dependency(AZURE_SDK)
+    message(STATUS "Found Azure SDK headers: ${AZURESDK_INCLUDE_DIR}")
+    message(STATUS "Found Azure SDK libraries: ${AZURESDK_LINK_LIBRARIES}")
+  endif()
 endif()
 
 # ----------------------------------------------------------------------

diff --git a/cpp/vcpkg.json b/cpp/vcpkg.json
@@ -42,6 +42,7 @@
     },
     "grpc",
     "gtest",
+    "libxml2", 
     "lz4",
     "openssl",
     "orc",