Move fiu nlohmann and easylogging to core/thirdparty (#12981)

Signed-off-by: yudong.cai <yudong.cai@zilliz.com>
2021-12-08 18:45:07 +08:00 · 2021-12-08 18:45:07 +08:00 · 85efcd8582
parent 260d3e124d
commit 85efcd8582
8 changed files with 2 additions and 33944 deletions
--- a/internal/core/src/index/knowhere/CMakeLists.txt
+++ b/internal/core/src/index/knowhere/CMakeLists.txt
@ -46,7 +46,7 @@ set(external_srcs

 set (LOG_SRC
        knowhere/common/Log.cpp
-        ${KNOWHERE_THIRDPARTY_SRC}/easyloggingpp/easylogging++.cc
+        ${MILVUS_THIRDPARTY_SRC}/easyloggingpp/easylogging++.cc
        )
 add_library(index_log STATIC ${LOG_SRC})
 set_target_properties(index_log PROPERTIES RULE_LAUNCH_COMPILE "")
--- a/internal/core/src/index/thirdparty/CMakeLists.txt
+++ b/internal/core/src/index/thirdparty/CMakeLists.txt
@ -48,10 +48,6 @@ if ( KNOWHERE_BUILD_TESTS )
 endif()


-if(NOT TARGET fiu)
-    add_subdirectory(fiu)
-endif()
-
 # ****************************** Thirdparty NGT ***************************************
 add_subdirectory(NGT)

--- a/internal/core/src/index/thirdparty/easyloggingpp/easylogging++.cc
+++ b/internal/core/src/index/thirdparty/easyloggingpp/easylogging++.cc
--- a/internal/core/src/index/thirdparty/easyloggingpp/easylogging++.h
+++ b/internal/core/src/index/thirdparty/easyloggingpp/easylogging++.h
--- a/internal/core/src/index/thirdparty/nlohmann/json.hpp
+++ b/internal/core/src/index/thirdparty/nlohmann/json.hpp
--- a/internal/core/thirdparty/CMakeLists.txt
+++ b/internal/core/thirdparty/CMakeLists.txt
@ -56,3 +56,4 @@ endif()

 add_subdirectory( protobuf )
 add_subdirectory( boost_ext )
+add_subdirectory( fiu )
--- a/internal/core/src/index/thirdparty/fiu/CMakeLists.txt
+++ b/internal/core/src/index/thirdparty/fiu/CMakeLists.txt
--- a/internal/core/src/index/thirdparty/fiu/fiu-local.h
+++ b/internal/core/src/index/thirdparty/fiu/fiu-local.h