diff --git a/ports/arrow/portfile.cmake b/ports/arrow/portfile.cmake index 7a1bbcb7c3..36b48e1e0b 100644 --- a/ports/arrow/portfile.cmake +++ b/ports/arrow/portfile.cmake @@ -80,6 +80,14 @@ if("dataset" IN_LIST FEATURES) ) endif() +if("acero" IN_LIST FEATURES) + vcpkg_cmake_config_fixup( + PACKAGE_NAME arrowacero + CONFIG_PATH lib/cmake/ArrowAcero + DO_NOT_DELETE_PARENT_CONFIG_PATH + ) +endif() + if("parquet" IN_LIST FEATURES) vcpkg_cmake_config_fixup( PACKAGE_NAME parquet @@ -94,6 +102,14 @@ if("parquet" IN_LIST FEATURES) file(READ "${CMAKE_CURRENT_LIST_DIR}/usage-parquet" usage-parquet) file(APPEND "${CURRENT_PACKAGES_DIR}/share/${PORT}/usage" "${usage-parquet}") endif() +if("dataset" IN_LIST FEATURES) + file(READ "${CMAKE_CURRENT_LIST_DIR}/usage-dataset" usage-dataset) + file(APPEND "${CURRENT_PACKAGES_DIR}/share/${PORT}/usage" "${usage-dataset}") +endif() +if("acero" IN_LIST FEATURES) + file(READ "${CMAKE_CURRENT_LIST_DIR}/usage-acero" usage-acero) + file(APPEND "${CURRENT_PACKAGES_DIR}/share/${PORT}/usage" "${usage-acero}") +endif() if("example" IN_LIST FEATURES) file(INSTALL "${SOURCE_PATH}/cpp/examples/minimal_build/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/example") diff --git a/ports/arrow/usage-acero b/ports/arrow/usage-acero new file mode 100644 index 0000000000..bde5ef80da --- /dev/null +++ b/ports/arrow/usage-acero @@ -0,0 +1,3 @@ + + find_package(ArrowAcero CONFIG REQUIRED) + target_link_libraries(main PRIVATE "$,ArrowAcero::arrow_acero_static,ArrowAcero::arrow_acero_shared>") diff --git a/ports/arrow/usage-dataset b/ports/arrow/usage-dataset new file mode 100644 index 0000000000..dcb9bda46b --- /dev/null +++ b/ports/arrow/usage-dataset @@ -0,0 +1,3 @@ + + find_package(ArrowDataset CONFIG REQUIRED) + target_link_libraries(main PRIVATE "$,ArrowDataset::arrow_dataset_static,ArrowDataset::arrow_dataset_shared>") diff --git a/ports/arrow/vcpkg.json b/ports/arrow/vcpkg.json index fd0baed8b0..15730c3cec 100644 --- a/ports/arrow/vcpkg.json +++ b/ports/arrow/vcpkg.json @@ -1,7 +1,7 @@ { "name": "arrow", "version": "12.0.0", - "port-version": 1, + "port-version": 2, "description": "Cross-language development platform for in-memory analytics", "homepage": "https://arrow.apache.org", "license": "Apache-2.0", diff --git a/versions/a-/arrow.json b/versions/a-/arrow.json index 76d7f7f631..9bcd7e62d2 100644 --- a/versions/a-/arrow.json +++ b/versions/a-/arrow.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f4aba951b4604b0846af32c50cf4e6959e0e119d", + "version": "12.0.0", + "port-version": 2 + }, { "git-tree": "4e29a49e78533ec10e3142ae7ad69fdd12c8d163", "version": "12.0.0", diff --git a/versions/baseline.json b/versions/baseline.json index cf468fce7d..7821c12fce 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -222,7 +222,7 @@ }, "arrow": { "baseline": "12.0.0", - "port-version": 1 + "port-version": 2 }, "arsenalgear": { "baseline": "2.1.0",