mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-11-28 01:29:01 +08:00
[orc] update to 1.5.5 (#4786)
* [orc] update to 1.5.3 * [orc] update usage with zstd * [orc] update to 1.5.4 * [orc] update to orc 1.5.5rc1 * [orc] fix static build * [orc] bump to 1.5.5
This commit is contained in:
parent
2978d2480f
commit
2fc5b2815e
@ -1,13 +0,0 @@
|
||||
diff --git a/tools/src/CMakeLists.txt b/tools/src/CMakeLists.txt
|
||||
index eb6d232..5a99f5c 100644
|
||||
--- a/tools/src/CMakeLists.txt
|
||||
+++ b/tools/src/CMakeLists.txt
|
||||
@@ -87,4 +87,7 @@ install(TARGETS
|
||||
orc-contents
|
||||
orc-metadata
|
||||
orc-statistics
|
||||
- DESTINATION bin)
|
||||
+ orc-scan
|
||||
+ orc-memory
|
||||
+ csv-import
|
||||
+ DESTINATION tools/orc)
|
@ -1,8 +1,8 @@
|
||||
diff --git a/c++/src/CMakeLists.txt b/c++/src/CMakeLists.txt
|
||||
index 91c67d5..4377b83 100644
|
||||
index 235ced8..0042a88 100644
|
||||
--- a/c++/src/CMakeLists.txt
|
||||
+++ b/c++/src/CMakeLists.txt
|
||||
@@ -197,11 +197,12 @@ endif(BUILD_LIBHDFSPP)
|
||||
@@ -218,12 +218,13 @@ endif(BUILD_LIBHDFSPP)
|
||||
add_library (orc STATIC ${SOURCE_FILES})
|
||||
|
||||
target_link_libraries (orc
|
||||
@ -10,22 +10,23 @@ index 91c67d5..4377b83 100644
|
||||
- zlib
|
||||
- snappy
|
||||
- lz4
|
||||
- zstd
|
||||
- ${LIBHDFSPP_LIBRARIES}
|
||||
+ PUBLIC
|
||||
+ PRIVATE
|
||||
+ protobuf::libprotobuf
|
||||
+ ZLIB::ZLIB
|
||||
+ Snappy::snappy
|
||||
+ ${LZ4_STATIC_LIB}
|
||||
+ ${ZSTD_STATIC_LIB}
|
||||
+ ${LIBHDFSPP_LIBRARIES}
|
||||
)
|
||||
|
||||
install(TARGETS orc DESTINATION lib)
|
||||
\ No newline at end of file
|
||||
diff --git a/c++/test/CMakeLists.txt b/c++/test/CMakeLists.txt
|
||||
index 015814a..2b55f4e 100644
|
||||
index db68578..709ad07 100644
|
||||
--- a/c++/test/CMakeLists.txt
|
||||
+++ b/c++/test/CMakeLists.txt
|
||||
@@ -48,10 +48,6 @@ add_executable (orc-test
|
||||
@@ -50,10 +50,10 @@ add_executable (orc-test
|
||||
|
||||
target_link_libraries (orc-test
|
||||
orc
|
||||
@ -33,14 +34,18 @@ index 015814a..2b55f4e 100644
|
||||
- protobuf
|
||||
- snappy
|
||||
- zlib
|
||||
+ protobuf::libprotobuf
|
||||
+ ZLIB::ZLIB
|
||||
+ Snappy::snappy
|
||||
+ ${LZ4_STATIC_LIB}
|
||||
${GTEST_LIBRARIES}
|
||||
)
|
||||
|
||||
diff --git a/cmake_modules/ThirdpartyToolchain.cmake b/cmake_modules/ThirdpartyToolchain.cmake
|
||||
index 0272263..8b79a12 100644
|
||||
index 1a28b1a..89f57d8 100644
|
||||
--- a/cmake_modules/ThirdpartyToolchain.cmake
|
||||
+++ b/cmake_modules/ThirdpartyToolchain.cmake
|
||||
@@ -51,8 +51,8 @@ endif ()
|
||||
@@ -59,8 +59,8 @@ endif ()
|
||||
# ----------------------------------------------------------------------
|
||||
# Snappy
|
||||
|
||||
@ -51,7 +56,7 @@ index 0272263..8b79a12 100644
|
||||
set(SNAPPY_VENDORED FALSE)
|
||||
else ()
|
||||
set(SNAPPY_HOME "${THIRDPARTY_DIR}/snappy_ep-install")
|
||||
@@ -70,10 +70,6 @@ else ()
|
||||
@@ -78,10 +78,6 @@ else ()
|
||||
set(SNAPPY_VENDORED TRUE)
|
||||
endif ()
|
||||
|
||||
@ -62,16 +67,17 @@ index 0272263..8b79a12 100644
|
||||
if (SNAPPY_VENDORED)
|
||||
add_dependencies (snappy snappy_ep)
|
||||
if (INSTALL_VENDORED_LIBS)
|
||||
@@ -85,7 +81,7 @@ endif ()
|
||||
@@ -93,7 +89,8 @@ endif ()
|
||||
# ----------------------------------------------------------------------
|
||||
# ZLIB
|
||||
|
||||
-if (NOT "${ZLIB_HOME}" STREQUAL "")
|
||||
+
|
||||
+if (NOT "${ZLIB_HOME}" STREQUAL "" OR 1)
|
||||
find_package (ZLIB REQUIRED)
|
||||
set(ZLIB_VENDORED FALSE)
|
||||
else ()
|
||||
@@ -112,10 +108,6 @@ else ()
|
||||
@@ -120,10 +117,6 @@ else ()
|
||||
set(ZLIB_VENDORED TRUE)
|
||||
endif ()
|
||||
|
||||
@ -82,10 +88,34 @@ index 0272263..8b79a12 100644
|
||||
if (ZLIB_VENDORED)
|
||||
add_dependencies (zlib zlib_ep)
|
||||
if (INSTALL_VENDORED_LIBS)
|
||||
@@ -127,8 +119,8 @@ endif ()
|
||||
@@ -134,9 +127,8 @@ endif ()
|
||||
|
||||
# ----------------------------------------------------------------------
|
||||
# Zstd
|
||||
-
|
||||
-if (NOT "${ZSTD_HOME}" STREQUAL "")
|
||||
- find_package (zstd REQUIRED)
|
||||
+if (NOT "${ZSTD_HOME}" STREQUAL "" OR 1)
|
||||
+ find_library(ZSTD_STATIC_LIB NAMES zstd zstd_static)
|
||||
set(ZSTD_VENDORED FALSE)
|
||||
else ()
|
||||
set(ZSTD_HOME "${THIRDPARTY_DIR}/zstd_ep-install")
|
||||
@@ -169,10 +161,6 @@ else ()
|
||||
set(ZSTD_VENDORED TRUE)
|
||||
endif ()
|
||||
|
||||
-include_directories (SYSTEM ${ZSTD_INCLUDE_DIR})
|
||||
-add_library (zstd STATIC IMPORTED)
|
||||
-set_target_properties (zstd PROPERTIES IMPORTED_LOCATION ${ZSTD_STATIC_LIB})
|
||||
-
|
||||
if (ZSTD_VENDORED)
|
||||
add_dependencies (zstd zstd_ep)
|
||||
if (INSTALL_VENDORED_LIBS)
|
||||
@@ -183,9 +171,8 @@ endif ()
|
||||
|
||||
# ----------------------------------------------------------------------
|
||||
# LZ4
|
||||
|
||||
-
|
||||
-if (NOT "${LZ4_HOME}" STREQUAL "")
|
||||
- find_package (LZ4 REQUIRED)
|
||||
+if (NOT "${LZ4_HOME}" STREQUAL "" OR 1)
|
||||
@ -93,19 +123,22 @@ index 0272263..8b79a12 100644
|
||||
set(LZ4_VENDORED FALSE)
|
||||
else ()
|
||||
set(LZ4_PREFIX "${THIRDPARTY_DIR}/lz4_ep-install")
|
||||
@@ -154,8 +146,6 @@ else ()
|
||||
@@ -211,10 +198,6 @@ else ()
|
||||
set(LZ4_VENDORED TRUE)
|
||||
endif ()
|
||||
|
||||
include_directories (SYSTEM ${LZ4_INCLUDE_DIR})
|
||||
-include_directories (SYSTEM ${LZ4_INCLUDE_DIR})
|
||||
-add_library (lz4 STATIC IMPORTED)
|
||||
-set_target_properties (lz4 PROPERTIES IMPORTED_LOCATION ${LZ4_STATIC_LIB})
|
||||
|
||||
-
|
||||
if (LZ4_VENDORED)
|
||||
add_dependencies (lz4 lz4_ep)
|
||||
@@ -230,8 +220,8 @@ endif ()
|
||||
if (INSTALL_VENDORED_LIBS)
|
||||
@@ -287,9 +270,8 @@ endif ()
|
||||
|
||||
# ----------------------------------------------------------------------
|
||||
# Protobuf
|
||||
|
||||
-
|
||||
-if (NOT "${PROTOBUF_HOME}" STREQUAL "")
|
||||
- find_package (Protobuf REQUIRED)
|
||||
+if (NOT "${PROTOBUF_HOME}" STREQUAL "" OR 1)
|
||||
@ -113,29 +146,39 @@ index 0272263..8b79a12 100644
|
||||
set(PROTOBUF_VENDORED FALSE)
|
||||
else ()
|
||||
set(PROTOBUF_PREFIX "${THIRDPARTY_DIR}/protobuf_ep-install")
|
||||
@@ -266,13 +256,8 @@ else ()
|
||||
@@ -325,14 +307,6 @@ else ()
|
||||
set(PROTOBUF_VENDORED TRUE)
|
||||
endif ()
|
||||
|
||||
-include_directories (SYSTEM ${PROTOBUF_INCLUDE_DIR})
|
||||
|
||||
-
|
||||
-add_library (protobuf STATIC IMPORTED)
|
||||
-set_target_properties (protobuf PROPERTIES IMPORTED_LOCATION ${PROTOBUF_STATIC_LIB})
|
||||
|
||||
-
|
||||
-add_library (protoc STATIC IMPORTED)
|
||||
-set_target_properties (protoc PROPERTIES IMPORTED_LOCATION ${PROTOC_STATIC_LIB})
|
||||
|
||||
-
|
||||
if (PROTOBUF_VENDORED)
|
||||
add_dependencies (protoc protobuf_ep)
|
||||
add_dependencies (protobuf protobuf_ep)
|
||||
diff --git a/tools/src/CMakeLists.txt b/tools/src/CMakeLists.txt
|
||||
index 667fab4..eb6d232 100644
|
||||
index f5a53ca..15391bf 100644
|
||||
--- a/tools/src/CMakeLists.txt
|
||||
+++ b/tools/src/CMakeLists.txt
|
||||
@@ -49,7 +49,6 @@ add_executable (orc-metadata
|
||||
@@ -51,7 +51,6 @@ add_executable (orc-metadata
|
||||
|
||||
target_link_libraries (orc-metadata
|
||||
orc
|
||||
- protobuf
|
||||
${CMAKE_THREAD_LIBS_INIT}
|
||||
)
|
||||
|
||||
add_executable (orc-statistics
|
||||
@@ -95,4 +94,7 @@ install(TARGETS
|
||||
orc-contents
|
||||
orc-metadata
|
||||
orc-statistics
|
||||
- DESTINATION bin)
|
||||
+ orc-scan
|
||||
+ orc-memory
|
||||
+ csv-import
|
||||
+ DESTINATION tools/orc)
|
@ -1,4 +1,4 @@
|
||||
Source: orc
|
||||
Version: 1.5.2-f47e02c-2
|
||||
Build-Depends: zlib, protobuf, lz4, snappy, gtest
|
||||
Version: 1.5.5
|
||||
Build-Depends: zlib, protobuf, lz4, snappy, zstd, gtest
|
||||
Description: The smallest, fastest columnar storage for Hadoop workloads.
|
||||
|
@ -3,16 +3,16 @@ include(vcpkg_common_functions)
|
||||
vcpkg_from_github(
|
||||
OUT_SOURCE_PATH SOURCE_PATH
|
||||
REPO apache/orc
|
||||
REF f47e02cfbf346f14d7f38c3ddd45d39e3b515847
|
||||
SHA512 5a389f4ab3b0ce4e7c8869493cf9e91feb4917a42bf2740abd71602fa03a2a53217b572e60af7328b7568dab084c07275ea275438ec8ae87f230a87fb60f2601
|
||||
REF 47a490f083bd411bf04bfed8131eef42606d7789
|
||||
SHA512 c2650d9fd367a5ec04c79c16434728e5c20608131f21bfc89d412cbaf8dd4ae5900b03e59df21d3617d8c6a9504e4b14b1f788157afa90b57d733499d2995e39
|
||||
HEAD_REF master
|
||||
PATCHES
|
||||
0001-dependencies-from-vcpkg.patch
|
||||
0002-fix-executable-output-folder.patch
|
||||
0003-dependencies-from-vcpkg.patch
|
||||
)
|
||||
|
||||
file(REMOVE "${SOURCE_PATH}/cmake_modules/FindGTest.cmake")
|
||||
file(REMOVE "${SOURCE_PATH}/cmake_modules/FindLZ4.cmake")
|
||||
file(REMOVE "${SOURCE_PATH}/cmake_modules/FindZSTD.cmake")
|
||||
file(REMOVE "${SOURCE_PATH}/cmake_modules/FindProtobuf.cmake")
|
||||
file(REMOVE "${SOURCE_PATH}/cmake_modules/FindSnappy.cmake")
|
||||
file(REMOVE "${SOURCE_PATH}/cmake_modules/FindZLIB.cmake")
|
||||
|
@ -5,6 +5,7 @@ The package orc does not provide CMake targets:
|
||||
find_package(Snappy CONFIG REQUIRED)
|
||||
|
||||
find_library(LZ4_LIBRARY NAMES lz4d lz4)
|
||||
find_library(ZSTD_LIBRARY NAMES zstd)
|
||||
find_library(ORC_LIBRARY NAMES orc)
|
||||
|
||||
target_link_libraries(main PRIVATE ${ORC_LIBRARY} protobuf::libprotoc protobuf::libprotobuf Snappy::snappy ${LZ4_LIBRARY} ZLIB::ZLIB)
|
||||
target_link_libraries(main PRIVATE ${ORC_LIBRARY} protobuf::libprotoc protobuf::libprotobuf Snappy::snappy ${LZ4_LIBRARY} ${ZSTD_LIBRARY} ZLIB::ZLIB)
|
||||
|
Loading…
Reference in New Issue
Block a user