Skip to content

Commit fef1790

Browse files
committed
fix
Signed-off-by: Yuan <yuanzhou@apache.org>
1 parent 9d76bae commit fef1790

2 files changed

Lines changed: 12 additions & 8 deletions

File tree

cpp/velox/CMakeLists.txt

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -384,14 +384,12 @@ else()
384384
endif()
385385
target_link_libraries(velox PUBLIC external::veloxthrift)
386386

387-
find_package(thriftprotocol CONFIG)
388-
if(thriftprotocol_FOUND AND TARGET thriftprotocol::thriftprotocol)
389-
add_library(external::thriftprotocol ALIAS thriftprotocol::thriftprotocol)
390-
else()
391-
message(STATUS "import Velox bundled thriftprotocol")
392-
import_library(external::thriftprotocol ${VELOX_BUILD_PATH}/_deps/thrift-build/lib/libthriftprotocol.a)
393-
endif()
394-
target_link_libraries(velox PUBLIC external::thriftprotocol)
387+
target_link_libraries(
388+
velox
389+
PRIVATE
390+
${VCPKG_INSTALLED_DIR}/x64-linux-avx/lib/libthriftcpp2.a
391+
${VCPKG_INSTALLED_DIR}/x64-linux-avx/lib/libthriftprotocol.a
392+
)
395393

396394
find_package(simdjson CONFIG)
397395
if(simdjson_FOUND AND TARGET simdjson::simdjson)

dev/vcpkg/vcpkg-configuration.json

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,12 @@
99
"baseline": "f82160a747b1b529daad7ce2f75a0d6c6a0d285d",
1010
"packages": [ "google-cloud-cpp"]
1111
},
12+
{
13+
"kind": "git",
14+
"repository": "https://github.com/Microsoft/vcpkg",
15+
"baseline": "2d32fae67c755b665794a0650f5d268979d7807f",
16+
"packages": [ "libsodium"]
17+
},
1218
{
1319
"kind": "git",
1420
"repository": "https://github.com/Microsoft/vcpkg",

0 commit comments

Comments
 (0)