From 3969cbaf0b21bdc0531f15b7ffc3cb902d4cb2dd Mon Sep 17 00:00:00 2001 From: zhiru Date: Tue, 11 Jun 2019 10:39:03 +0800 Subject: [PATCH] cmake: remove redundant libs in src Former-commit-id: 9d73816a0d20620d54d813d08739855dd4cc9909 --- cpp/CHANGELOG.md | 1 + cpp/src/CMakeLists.txt | 53 +++----------------------------------- cpp/src/sdk/CMakeLists.txt | 1 - 3 files changed, 5 insertions(+), 50 deletions(-) diff --git a/cpp/CHANGELOG.md b/cpp/CHANGELOG.md index 34d80abbbf..605e100457 100644 --- a/cpp/CHANGELOG.md +++ b/cpp/CHANGELOG.md @@ -15,6 +15,7 @@ Please mark all change in change log and use the ticket from JIRA. - MS-64 - Different table can have different index type - MS-52 - Return search score - MS-66 - Support time range query +- MS-70 - cmake: remove redundant libs in src ## Task diff --git a/cpp/src/CMakeLists.txt b/cpp/src/CMakeLists.txt index e3943cf594..6cd7db71ca 100644 --- a/cpp/src/CMakeLists.txt +++ b/cpp/src/CMakeLists.txt @@ -50,32 +50,12 @@ set(get_sys_info_files license/GetSysInfo.cpp) include_directories(/usr/include) -include_directories(/usr/local/cuda/include) +include_directories("${CUDA_TOOLKIT_ROOT_DIR}/include") include_directories(thrift/gen-cpp) -#target_link_libraries(megasearch boost_system_static) -#target_link_libraries(megasearch boost_filesystem_static) -#target_link_libraries(megasearch boost_serialization_static) -#target_link_libraries(megasearch bzip2) -#target_link_libraries(megasearch easyloggingpp) -#target_link_libraries(megasearch faiss) -#target_link_libraries(megasearch gtest) -#target_link_libraries(megasearch lapack) -#target_link_libraries(megasearch lz4) -#target_link_libraries(megasearch openblas) -#target_link_libraries(megasearch rocksdb) -#target_link_libraries(megasearch snappy) -#target_link_libraries(megasearch sqlite) -#target_link_libraries(megasearch sqlite_orm) -#target_link_libraries(megasearch thrift) -#target_link_libraries(megasearch yaml-cpp) -#target_link_libraries(megasearch zlib) -#target_link_libraries(megasearch zstd) - set(third_party_libs easyloggingpp sqlite - # sqlite_orm thrift yaml-cpp faiss @@ -96,45 +76,29 @@ set(third_party_libs ) if (GPU_VERSION STREQUAL "ON") - link_directories(/usr/local/cuda/lib64) + link_directories("${CUDA_TOOLKIT_ROOT_DIR}/lib64") set(engine_libs pthread - libfaiss.a - libgpufaiss.a libgomp.a - libopenblas.a libgfortran.a libquadmath.a cudart cublas - libsqlite3.a - libprometheus-cpp-push.a - libprometheus-cpp-pull.a - libprometheus-cpp-core.a ) else() set(engine_libs pthread - libfaiss.a libgomp.a - libopenblas.a libgfortran.a libquadmath.a - libsqlite3.a - libprometheus-cpp-push.a - libprometheus-cpp-pull.a - libprometheus-cpp-core.a ) endif () if (ENABLE_LICENSE STREQUAL "ON") - link_directories(/usr/local/cuda/lib64/stubs) - link_directories(/usr/local/cuda/lib64) + link_directories("${CUDA_TOOLKIT_ROOT_DIR}/lib64/stubs") + link_directories("${CUDA_TOOLKIT_ROOT_DIR}/lib64") set(license_libs nvidia-ml - libboost_system.a - libboost_filesystem.a - libboost_serialization.a crypto cudart cublas @@ -164,16 +128,7 @@ endif () set(server_libs vecwise_engine - libthrift.a pthread - libyaml-cpp.a - libboost_system.a - libboost_filesystem.a - libsnappy.a - libbz2.a - libz.a - libzstd.a - liblz4.a dl metrics diff --git a/cpp/src/sdk/CMakeLists.txt b/cpp/src/sdk/CMakeLists.txt index 74f34d8615..4e4b8a2c23 100644 --- a/cpp/src/sdk/CMakeLists.txt +++ b/cpp/src/sdk/CMakeLists.txt @@ -26,7 +26,6 @@ add_library(megasearch_sdk STATIC ${service_files} ) -link_directories(../../third_party/build/lib) target_link_libraries(megasearch_sdk ${third_party_libs} )