diff options
| author | Phil Felton <philipf@gresearch.co.uk> | 2018-07-03 11:55:04 +0100 |
|---|---|---|
| committer | Phil Felton <philipf@gresearch.co.uk> | 2018-07-03 11:55:04 +0100 |
| commit | da4729bcc6d38843345fb7e250e122b04db4b3f7 (patch) | |
| tree | d55d206ad0a16a4378b2e4aa10bf22208129fcb9 | |
| parent | 4e5669239c0ee919bb27d1c546ba6bb8f8c0c456 (diff) | |
| download | vcpkg-da4729bcc6d38843345fb7e250e122b04db4b3f7.tar.gz vcpkg-da4729bcc6d38843345fb7e250e122b04db4b3f7.zip | |
Fix dependencies, remove commented out CMake, use appropriate CMake version
| -rw-r--r-- | ports/parquet/CONTROL | 2 | ||||
| -rw-r--r-- | ports/parquet/all.patch | 4 | ||||
| -rw-r--r-- | ports/parquet/portfile.cmake | 9 |
3 files changed, 3 insertions, 12 deletions
diff --git a/ports/parquet/CONTROL b/ports/parquet/CONTROL index 7de3e15d4..c9288597e 100644 --- a/ports/parquet/CONTROL +++ b/ports/parquet/CONTROL @@ -1,4 +1,4 @@ Source: parquet Version: 1.4.0 -Build-Depends: arrow, thrift, gtest, brotli +Build-Depends: arrow, thrift, gtest Description: Parquet-cpp is a C++ library to read and write the Apache Parquet columnar data format.
\ No newline at end of file diff --git a/ports/parquet/all.patch b/ports/parquet/all.patch index 5bd7fa659..e9ec99662 100644 --- a/ports/parquet/all.patch +++ b/ports/parquet/all.patch @@ -1,5 +1,5 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 304f3fb..0f2c563 100644 +index 304f3fb..0b0fc1f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -16,7 +16,7 @@ @@ -7,7 +7,7 @@ index 304f3fb..0f2c563 100644 # Require cmake that supports BYPRODUCTS in add_custom_command, ExternalProject_Add [1]. -cmake_minimum_required(VERSION 3.2.0) -+cmake_minimum_required(VERSION 3.11.1) ++cmake_minimum_required(VERSION 3.8) file(READ "${CMAKE_CURRENT_SOURCE_DIR}/.parquetcppversion" PARQUET_VERSION) string(REPLACE "\n" "" PARQUET_VERSION "${PARQUET_VERSION}") diff --git a/ports/parquet/portfile.cmake b/ports/parquet/portfile.cmake index 8ac3491f6..5a67bf346 100644 --- a/ports/parquet/portfile.cmake +++ b/ports/parquet/portfile.cmake @@ -34,19 +34,10 @@ vcpkg_configure_cmake( -DPARQUET_ARROW_LINKAGE=${VCPKG_LIBRARY_LINKAGE} -DPARQUET_BUILD_TOOLCHAIN=${CURRENT_INSTALLED_DIR} -DPARQUET_BOOST_USE_SHARED=${PARQUET_BUILD_SHARED} - #-DARROW_STATIC=ON ) vcpkg_install_cmake() -#if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") -# file(RENAME ${CURRENT_PACKAGES_DIR}/lib/arrow_static.lib ${CURRENT_PACKAGES_DIR}/lib/arrow.lib) -# file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/arrow_static.lib ${CURRENT_PACKAGES_DIR}/debug/lib/arrow.lib) -# file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/bin ${CURRENT_PACKAGES_DIR}/bin) -#else() -# file(REMOVE ${CURRENT_PACKAGES_DIR}/lib/arrow_static.lib ${CURRENT_PACKAGES_DIR}/debug/lib/arrow_static.lib) -#endif() - file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/parquet RENAME copyright) # Put CMake files in the right place |