Merge branch 'branch-1.2' into 'branch-1.2'

MS-29 fix third-party link error

See merge request megasearch/vecwise_engine!42

Former-commit-id: 37027de76b885d75195431545a7eea6424b0b2ec
This commit is contained in:
jinhai 2019-05-29 17:35:56 +08:00
commit 24b3da9fdb
2 changed files with 16 additions and 16 deletions

View File

@ -71,21 +71,21 @@ include_directories(thrift/gen-cpp)
#target_link_libraries(megasearch zstd)
set(third_party_libs
easyloggingpp
sqlite
# sqlite_orm
thrift
yaml-cpp
faiss
lapack
openblas
rocksdb
boost_system_static
boost_filesystem_static
boost_serialization_static
bzip2
easyloggingpp
faiss
lapack
lz4
openblas
rocksdb
snappy
sqlite
# sqlite_orm
thrift
yaml-cpp
zlib
zstd
)

View File

@ -35,19 +35,19 @@ cuda_add_executable(server_test
set(require_libs
stdc++
boost_system
boost_filesystem
pthread
snappy
bz2
z
zstd
rocksdb
faiss
cudart
cublas
sqlite3
boost_system
boost_filesystem
snappy
z
bz2
zstd
lz4
pthread
)
target_link_libraries(server_test