milvus-io
/
milvus
mirror of https://github.com/milvus-io/milvus.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Rearrange CMakeLists.txt of lib tracing (#2986) 

* sort out cmake commands in before project

Signed-off-by: yangxuan <xuan.yang@zilliz.com>

* update

Signed-off-by: Xiangyu Wang <xy.wang@zilliz.com>

* rearrange core CmakeLists.txt

Signed-off-by: yangxuan <xuan.yang@zilliz.com>

* fix conflict

Signed-off-by: yangxuan <xuan.yang@zilliz.com>

* fix bugs on ENABLE_FIU

Signed-off-by: yangxuan <xuan.yang@zilliz.com>

* rm BUILD_WITH_MKL

Signed-off-by: yangxuan <xuan.yang@zilliz.com>

* buildable version

Signed-off-by: yangxuan <xuan.yang@zilliz.com>

* orgnize lib search and query

Signed-off-by: yangxuan <xuan.yang@zilliz.com>

* fix query and search bug

Signed-off-by: yangxuan <xuan.yang@zilliz.com>

* rm null variable

Signed-off-by: yangxuan <xuan.yang@zilliz.com>

* rearrange CMakeLists.txt of lib tracing

Signed-off-by: yangxuan <xuan.yang@zilliz.com>

Co-authored-by: yangxuan <xuan.yang@zilliz.com>
Co-authored-by: Xiangyu Wang <xy.wang@zilliz.com>
pull/2978/head^2
XuanYang-cn 2020-07-23 18:56:26 +08:00 committed by GitHub
parent 8fe7a40946
commit b081c9e4f1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
core/src/CMakeLists.txt
View File

@ -19,6 +19,7 @@ include_directories(${MILVUS_ENGINE_SRC}/grpc/gen-status)
include_directories(${MILVUS_ENGINE_SRC}/grpc/gen-milvus) include_directories(${MILVUS_ENGINE_SRC}/grpc/gen-milvus)
add_subdirectory(config) add_subdirectory(config)
add_subdirectory(tracing)
set(FOUND_OPENBLAS "unknown") set(FOUND_OPENBLAS "unknown")
@ -139,8 +140,6 @@ aux_source_directory(${MILVUS_ENGINE_SRC}/utils utils_files)
aux_source_directory(${MILVUS_ENGINE_SRC}/index/archive wrapper_files) aux_source_directory(${MILVUS_ENGINE_SRC}/index/archive wrapper_files)
aux_source_directory(${MILVUS_ENGINE_SRC}/tracing tracing_files)
aux_source_directory(${MILVUS_ENGINE_SRC}/codecs codecs_files) aux_source_directory(${MILVUS_ENGINE_SRC}/codecs codecs_files)
aux_source_directory(${MILVUS_ENGINE_SRC}/codecs/default codecs_default_files) aux_source_directory(${MILVUS_ENGINE_SRC}/codecs/default codecs_default_files)
aux_source_directory(${MILVUS_ENGINE_SRC}/codecs/snapshot codecs_snapshot_files) aux_source_directory(${MILVUS_ENGINE_SRC}/codecs/snapshot codecs_snapshot_files)
@ -284,7 +283,6 @@ target_link_libraries(metrics ${metrics_lib})
add_library(milvus_engine STATIC ${engine_files}) add_library(milvus_engine STATIC ${engine_files})
add_dependencies(milvus_engine fiu)
target_link_libraries(milvus_engine target_link_libraries(milvus_engine
knowhere knowhere
${third_party_libs} ${third_party_libs}
@ -292,18 +290,6 @@ target_link_libraries(milvus_engine
metrics metrics
) )
add_library(tracing STATIC ${tracing_files} ${thirdparty_files})
add_dependencies(tracing fiu)
set(tracing_lib
opentracing
opentracing_mocktracer
${grpc_lib}
pthread
z
)
target_link_libraries(tracing ${tracing_lib})
set(server_libs set(server_libs
milvus_engine milvus_engine
config config
@ -323,7 +309,6 @@ add_executable(milvus_server
${web_server_files} ${web_server_files}
${server_context_files} ${server_context_files}
${utils_files} ${utils_files}
${tracing_files}
) )
target_link_libraries(milvus_server target_link_libraries(milvus_server

12
core/src/tracing/CMakeLists.txt Normal file
View File

@ -0,0 +1,12 @@
aux_source_directory(${MILVUS_ENGINE_SRC}/tracing tracing_files)
add_library(tracing STATIC ${tracing_files} ${thirdparty_files})
set(tracing_lib
opentracing
opentracing_mocktracer
${grpc_lib}
pthread
z
)
target_link_libraries(tracing ${tracing_lib})