3party/vcpkg
0
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2025-01-14 14:37:55 +08:00
Code Issues Projects Releases Wiki Activity

Fix dependencies, remove commented out CMake, use appropriate CMake version

Browse Source
This commit is contained in:
Phil Felton 2018-07-03 11:55:04 +01:00
parent 4e5669239c
commit da4729bcc6
3 changed files with 3 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ports/parquet/CONTROL
View File

@ -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.

4
ports/parquet/all.patch
View File

@ -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}")

9
ports/parquet/portfile.cmake
View File

@ -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