From b8949ca86f808bfea385fb1f9c24abc0f3bebd05 Mon Sep 17 00:00:00 2001 From: Xu Peng Date: Mon, 6 May 2019 20:52:02 +0800 Subject: [PATCH 1/2] fix(env): fix compile error Former-commit-id: 63a2957e3c226bdb08658d96738d30dc98a73619 --- cpp/unittest/faiss_wrapper/CMakeLists.txt | 1 + cpp/unittest/server/CMakeLists.txt | 1 + 2 files changed, 2 insertions(+) diff --git a/cpp/unittest/faiss_wrapper/CMakeLists.txt b/cpp/unittest/faiss_wrapper/CMakeLists.txt index a1b16a9cda..ce45b2e4ea 100644 --- a/cpp/unittest/faiss_wrapper/CMakeLists.txt +++ b/cpp/unittest/faiss_wrapper/CMakeLists.txt @@ -41,6 +41,7 @@ set(wrapper_libs snappy bz2 z + zstd ) target_link_libraries(wrapper_test ${unittest_libs} ${wrapper_libs}) diff --git a/cpp/unittest/server/CMakeLists.txt b/cpp/unittest/server/CMakeLists.txt index 8e8e116481..ddcf835da2 100644 --- a/cpp/unittest/server/CMakeLists.txt +++ b/cpp/unittest/server/CMakeLists.txt @@ -40,6 +40,7 @@ set(require_libs snappy bz2 z + zstd rocksdb faiss cudart From b51a88abfd8143209ec5ce16120eca4c8d686031 Mon Sep 17 00:00:00 2001 From: groot Date: Mon, 6 May 2019 21:14:39 +0800 Subject: [PATCH 2/2] build error Former-commit-id: 927fdda8e7b2d7782c800cdff83b9966a26f25f2 --- cpp/test_client/CMakeLists.txt | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/cpp/test_client/CMakeLists.txt b/cpp/test_client/CMakeLists.txt index 752619d85d..08dd60d08b 100644 --- a/cpp/test_client/CMakeLists.txt +++ b/cpp/test_client/CMakeLists.txt @@ -19,14 +19,7 @@ set(service_files ../src/thrift/gen-cpp/VectorService_constants.cpp ../src/thrift/gen-cpp/VectorService_types.cpp) -add_executable(test_client - ./main.cpp - ../src/server/ServerConfig.cpp - ${client_src} - ${service_files} - ${config_files} - ${util_files} - ${VECWISE_THIRD_PARTY_BUILD}/include/easylogging++.cc) + link_directories( "${CMAKE_BINARY_DIR}/lib" @@ -49,6 +42,15 @@ set(client_libs include_directories(/usr/local/cuda/include) find_library(cuda_library cudart cublas HINTS /usr/local/cuda/lib64) +add_executable(test_client + ./main.cpp + ../src/server/ServerConfig.cpp + ${client_src} + ${service_files} + ${config_files} + ${util_files} + ${VECWISE_THIRD_PARTY_BUILD}/include/easylogging++.cc) + target_link_libraries(test_client ${unittest_libs} ${client_libs} ${cuda_library}) #add_executable(skeleton_server