diff options
| author | Barath Kannan <barathsotd@gmail.com> | 2017-12-27 16:57:43 +1100 |
|---|---|---|
| committer | Barath Kannan <barathsotd@gmail.com> | 2017-12-27 16:57:43 +1100 |
| commit | d8f0ea999983892b8e5e49340ece3474ee257156 (patch) | |
| tree | ce9b615075350d90d0b7312874bae6dd202fe93b /ports/arrow | |
| parent | 22e9a2b25db21e1d1a1f75786442f2c90ae0db0c (diff) | |
| parent | 6e05f9cdf5cf4d53153214f4d4b29133b368bc4d (diff) | |
| download | vcpkg-d8f0ea999983892b8e5e49340ece3474ee257156.tar.gz vcpkg-d8f0ea999983892b8e5e49340ece3474ee257156.zip | |
resolve merge conflicts
Diffstat (limited to 'ports/arrow')
| -rw-r--r-- | ports/arrow/CONTROL | 4 | ||||
| -rw-r--r-- | ports/arrow/portfile.cmake | 5 |
2 files changed, 5 insertions, 4 deletions
diff --git a/ports/arrow/CONTROL b/ports/arrow/CONTROL index 78cbf2a18..000b8a6d6 100644 --- a/ports/arrow/CONTROL +++ b/ports/arrow/CONTROL @@ -1,4 +1,4 @@ Source: arrow -Version: 0.6.0 -Build-Depends: boost, flatbuffers, rapidjson, zlib, lz4, brotli, zstd, snappy, gflags +Version: 0.6.0-1 +Build-Depends: boost-system, boost-filesystem, boost-multiprecision, boost-algorithm, flatbuffers, rapidjson, zlib, lz4, brotli, zstd, snappy, gflags 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. diff --git a/ports/arrow/portfile.cmake b/ports/arrow/portfile.cmake index c70a3cdc3..a462d3e9b 100644 --- a/ports/arrow/portfile.cmake +++ b/ports/arrow/portfile.cmake @@ -12,7 +12,6 @@ vcpkg_from_github( HEAD_REF master ) - set(CPP_SOURCE_PATH "${SOURCE_PATH}/cpp") vcpkg_apply_patches( @@ -27,7 +26,9 @@ string(COMPARE EQUAL ${VCPKG_LIBRARY_LINKAGE} "static" ARROW_BUILD_STATIC) vcpkg_configure_cmake( SOURCE_PATH ${CPP_SOURCE_PATH} - OPTIONS -DARROW_BUILD_TESTS=off + PREFER_NINJA + OPTIONS + -DARROW_BUILD_TESTS=off -DRAPIDJSON_HOME=${CURRENT_INSTALLED_DIR} -DFLATBUFFERS_HOME=${CURRENT_INSTALLED_DIR} -DARROW_ZLIB_VENDORED=ON |