mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-29 22:47:49 +08:00
1550b9e71b
* [many ports] Upgrades 2019.07.11 * Re-generate patches and fix build errors. * [manyport]Fix build errors. * Fix avro-c and console-bridge failures, revert curl and tesseract * fix botan failure * Fix build errors and undo some ports upgrades. * [aws-c-common,chipmunk,cxxopts,grpc]Fix build errors * Fix build errors. * [angle]Undo upgrade changes. * [directxtk]Fix UWP build error (#7233) * Revert leptonica since it cause tesseract failed * Revert jsonnet * [google-cloud-cpp] Disable parallel configure due to source directory writes * [many ports] Undo undesired changes * [bitsery] Fix indentation * [avro-c][aws-c-common][graphite2] Convert line endings to minimize PR diff * fix console-bridge and remove usockets unused patch * update ogre patch * [many ports] Revert unneeded changes w.r.t. master. Add missing write to console-bridge. * [console-bridge] Fix export macro * [avro-c] Revert upgrade; split to #7875 * [avro-c] Complete previous revert
138 lines
3.8 KiB
Diff
138 lines
3.8 KiB
Diff
diff --git a/c++/src/CMakeLists.txt b/c++/src/CMakeLists.txt
|
|
index fae9be0..35cfb5f 100644
|
|
--- a/c++/src/CMakeLists.txt
|
|
+++ b/c++/src/CMakeLists.txt
|
|
@@ -215,11 +215,12 @@ endif(ORC_CXX_HAS_THREAD_LOCAL AND BUILD_LIBHDFSPP)
|
|
add_library (orc STATIC ${SOURCE_FILES})
|
|
|
|
target_link_libraries (orc
|
|
- protobuf
|
|
- zlib
|
|
- snappy
|
|
- lz4
|
|
- ${LIBHDFSPP_LIBRARIES}
|
|
+ PRIVATE
|
|
+ protobuf::libprotobuf
|
|
+ ZLIB::ZLIB
|
|
+ Snappy::snappy
|
|
+ ${LZ4_STATIC_LIB}
|
|
+ ${LIBHDFSPP_LIBRARIES}
|
|
)
|
|
|
|
install(TARGETS orc DESTINATION lib)
|
|
diff --git a/cmake_modules/ThirdpartyToolchain.cmake b/cmake_modules/ThirdpartyToolchain.cmake
|
|
index f8584c0..fe48340 100644
|
|
--- a/cmake_modules/ThirdpartyToolchain.cmake
|
|
+++ b/cmake_modules/ThirdpartyToolchain.cmake
|
|
@@ -51,8 +51,8 @@ endif ()
|
|
# ----------------------------------------------------------------------
|
|
# Snappy
|
|
|
|
-if (NOT "${SNAPPY_HOME}" STREQUAL "")
|
|
- find_package (Snappy REQUIRED)
|
|
+if (1)
|
|
+ find_package (Snappy CONFIG REQUIRED)
|
|
set(SNAPPY_VENDORED FALSE)
|
|
else ()
|
|
set(SNAPPY_HOME "${THIRDPARTY_DIR}/snappy_ep-install")
|
|
@@ -70,10 +70,6 @@ else ()
|
|
set(SNAPPY_VENDORED TRUE)
|
|
endif ()
|
|
|
|
-include_directories (SYSTEM ${SNAPPY_INCLUDE_DIR})
|
|
-add_library (snappy STATIC IMPORTED)
|
|
-set_target_properties (snappy PROPERTIES IMPORTED_LOCATION ${SNAPPY_STATIC_LIB})
|
|
-
|
|
if (SNAPPY_VENDORED)
|
|
add_dependencies (snappy snappy_ep)
|
|
if (INSTALL_VENDORED_LIBS)
|
|
@@ -85,7 +81,7 @@ endif ()
|
|
# ----------------------------------------------------------------------
|
|
# ZLIB
|
|
|
|
-if (NOT "${ZLIB_HOME}" STREQUAL "")
|
|
+if (1)
|
|
find_package (ZLIB REQUIRED)
|
|
set(ZLIB_VENDORED FALSE)
|
|
else ()
|
|
@@ -112,10 +108,6 @@ else ()
|
|
set(ZLIB_VENDORED TRUE)
|
|
endif ()
|
|
|
|
-include_directories (SYSTEM ${ZLIB_INCLUDE_DIR})
|
|
-add_library (zlib STATIC IMPORTED)
|
|
-set_target_properties (zlib PROPERTIES IMPORTED_LOCATION ${ZLIB_STATIC_LIB})
|
|
-
|
|
if (ZLIB_VENDORED)
|
|
add_dependencies (zlib zlib_ep)
|
|
if (INSTALL_VENDORED_LIBS)
|
|
@@ -127,8 +119,8 @@ endif ()
|
|
# ----------------------------------------------------------------------
|
|
# LZ4
|
|
|
|
-if (NOT "${LZ4_HOME}" STREQUAL "")
|
|
- find_package (LZ4 REQUIRED)
|
|
+if (1)
|
|
+ find_library (LZ4_STATIC_LIB NAMES lz4d lz4)
|
|
set(LZ4_VENDORED FALSE)
|
|
else ()
|
|
set(LZ4_PREFIX "${THIRDPARTY_DIR}/lz4_ep-install")
|
|
@@ -154,10 +146,6 @@ else ()
|
|
set(LZ4_VENDORED TRUE)
|
|
endif ()
|
|
|
|
-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)
|
|
if (INSTALL_VENDORED_LIBS)
|
|
@@ -231,8 +219,8 @@ endif ()
|
|
# ----------------------------------------------------------------------
|
|
# Protobuf
|
|
|
|
-if (NOT "${PROTOBUF_HOME}" STREQUAL "")
|
|
- find_package (Protobuf REQUIRED)
|
|
+if (1)
|
|
+ find_package (Protobuf CONFIG REQUIRED)
|
|
set(PROTOBUF_VENDORED FALSE)
|
|
else ()
|
|
set(PROTOBUF_PREFIX "${THIRDPARTY_DIR}/protobuf_ep-install")
|
|
@@ -268,14 +256,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..7745fe0 100644
|
|
--- a/tools/src/CMakeLists.txt
|
|
+++ b/tools/src/CMakeLists.txt
|
|
@@ -49,7 +49,6 @@ add_executable (orc-metadata
|
|
|
|
target_link_libraries (orc-metadata
|
|
orc
|
|
- protobuf
|
|
)
|
|
|
|
add_executable (orc-statistics
|
|
@@ -88,4 +87,7 @@ install(TARGETS
|
|
orc-contents
|
|
orc-metadata
|
|
orc-statistics
|
|
- DESTINATION bin)
|
|
+ orc-scan
|
|
+ orc-memory
|
|
+ csv-import
|
|
+ DESTINATION tools/orc)
|