change build settings

Former-commit-id: fe3df7b281a528d4e07669c7c4e0e1521eb6bf2a

cpp/src/CMakeLists.txt

@@ -14,38 +14,46 @@ aux_source_directory(wrapper wrapper_files)
 set(service_files
         thrift/gen-cpp/VecService.cpp
         thrift/gen-cpp/VectorService_constants.cpp
-        thrift/gen-cpp/VectorService_types.cpp)
+        thrift/gen-cpp/VectorService_types.cpp
+        )
 
 set(vecwise_engine_src
         ${CMAKE_CURRENT_SOURCE_DIR}/main.cpp
         ${cache_files}
         ${db_files}
-        ${wrapper_files})
+        ${wrapper_files}
+        )
 
 include_directories(/usr/local/cuda/include)
 find_library(cuda_library cudart cublas HINTS /usr/local/cuda/lib64)
 
-add_library(vecwise_engine STATIC ${vecwise_engine_src})
+cuda_add_library(vecwise_engine STATIC ${vecwise_engine_src})
+
+set(engine_libs
+        pthread
+        faiss
+        cudart
+        cublas
+        sqlite3
+        )
 
-cuda_add_executable(vecwise_server
+target_link_libraries(vecwise_engine ${engine_libs} ${cuda_library})
+
+add_executable(vecwise_server
         ${config_files}
         ${server_files}
         ${utils_files}
         ${service_files}
-        ${wrapper_files}
-        ${service_files}
         ${VECWISE_THIRD_PARTY_BUILD}/include/easylogging++.cc
         )
 
-set(dependency_libs
-        vecwise_engine
+set(server_libs
         yaml-cpp
         boost_system
         boost_filesystem
         thrift
         pthread
-        faiss
         vecwise_engine
-        sqlite3
         )
-target_link_libraries(vecwise_server ${dependency_libs} ${cuda_library})
+
+target_link_libraries(vecwise_server ${server_libs})

cpp/unittest/faiss_wrapper/CMakeLists.txt

@@ -14,7 +14,8 @@ link_directories("/usr/local/cuda/lib64")
 set(wrapper_test_src
         ${unittest_srcs}
         ${wrapper_src}
-        wrapper_test.cpp)
+        wrapper_test.cpp
+        )
 
 add_executable(wrapper_test ${wrapper_test_src})