diff options
| author | Isaac Brodsky <isaac@isaacbrodsky.com> | 2020-04-23 13:27:34 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-23 13:27:34 -0700 |
| commit | cc906546f406538ffcaff59dc805f6e5b2f284e1 (patch) | |
| tree | c76ae34c57527ee6346e8b78cb6b90fc61701827 | |
| parent | 1585054d26cba323a59eb5fa94b66cbb4a241c9c (diff) | |
| download | vcpkg-cc906546f406538ffcaff59dc805f6e5b2f284e1.tar.gz vcpkg-cc906546f406538ffcaff59dc805f6e5b2f284e1.zip | |
[Arrow] Explicitly enable CSV and JSON (#10800)
* [Arrow] Explicitly enable CSV and JSON
* Convert file formats to default features
* Change per review
| -rw-r--r-- | ports/arrow/CONTROL | 14 | ||||
| -rw-r--r-- | ports/arrow/portfile.cmake | 12 |
2 files changed, 20 insertions, 6 deletions
diff --git a/ports/arrow/CONTROL b/ports/arrow/CONTROL index 23bc90eb0..f2461dfef 100644 --- a/ports/arrow/CONTROL +++ b/ports/arrow/CONTROL @@ -1,6 +1,16 @@ Source: arrow -Version: 0.17.0 +Version: 0.17.0-1 Build-Depends: boost-system, boost-filesystem, boost-multiprecision, boost-algorithm, flatbuffers, rapidjson, zlib, lz4, brotli, bzip2, zstd, snappy, gflags, thrift, double-conversion, glog, uriparser, openssl Homepage: https://github.com/apache/arrow Description: Apache Arrow is a columnar in-memory analytics layer designed to accelerate big data. It houses a set of canonical in-memory representations of flat and hierarchical data along with multiple language-bindings for structure manipulation. It also provides IPC and common algorithm implementations. -Supports: x64
\ No newline at end of file +Supports: x64 +Default-Features: csv, json, parquet + +Feature: csv +Description: CSV file support + +Feature: json +Description: JSON file support + +Feature: parquet +Description: Parquet file support diff --git a/ports/arrow/portfile.cmake b/ports/arrow/portfile.cmake index 06561a906..cb26d07ff 100644 --- a/ports/arrow/portfile.cmake +++ b/ports/arrow/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions) - if(NOT VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") message(FATAL_ERROR "Apache Arrow only supports x64") endif() @@ -17,6 +15,12 @@ vcpkg_from_github( string(COMPARE EQUAL ${VCPKG_LIBRARY_LINKAGE} "dynamic" ARROW_BUILD_SHARED) string(COMPARE EQUAL ${VCPKG_LIBRARY_LINKAGE} "static" ARROW_BUILD_STATIC) +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + "csv" ARROW_CSV + "json" ARROW_JSON + "parquet" ARROW_PARQUET +) + vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH}/cpp PREFER_NINJA @@ -24,7 +28,7 @@ vcpkg_configure_cmake( -DARROW_DEPENDENCY_SOURCE=SYSTEM -Duriparser_SOURCE=SYSTEM -DARROW_BUILD_TESTS=off - -DARROW_PARQUET=ON + ${FEATURE_OPTIONS} -DARROW_BUILD_STATIC=${ARROW_BUILD_STATIC} -DARROW_BUILD_SHARED=${ARROW_BUILD_SHARED} -DARROW_GFLAGS_USE_SHARED=off @@ -52,7 +56,7 @@ vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/arrow) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/lib/cmake) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib/cmake) -file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/arrow RENAME copyright) +file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) |