From cd9a02376aad4b408c69ae5b73426ebe8833d2d1 Mon Sep 17 00:00:00 2001
From: Enwei Jiao <enwei.jiao@zilliz.com>
Date: Thu, 2 Nov 2023 15:50:34 -0700
Subject: [PATCH] Remove deprecated conan generator

Signed-off-by: Enwei Jiao <enwei.jiao@zilliz.com>
---
 CMakeLists.txt              | 2 +-
 cmake/libs/libdiskann.cmake | 1 +
 conanfile.py                | 6 ++++--
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index ace217aa5..13490f438 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -84,7 +84,6 @@ find_package(nlohmann_json REQUIRED)
 find_package(glog REQUIRED)
 find_package(prometheus-cpp REQUIRED)
 find_package(fmt REQUIRED)
-include_directories(${fmt_INCLUDE_DIR})
 set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_OSX_DEPLOYMENT_TARGET "10.13" CACHE STRING "Minimum OS X deployment version" FORCE)
 
@@ -130,6 +129,7 @@ list(APPEND KNOWHERE_LINKER_LIBS faiss)
 list(APPEND KNOWHERE_LINKER_LIBS glog::glog)
 list(APPEND KNOWHERE_LINKER_LIBS nlohmann_json::nlohmann_json)
 list(APPEND KNOWHERE_LINKER_LIBS prometheus-cpp::core prometheus-cpp::push)
+list(APPEND KNOWHERE_LINKER_LIBS fmt::fmt-header-only)
 list(APPEND KNOWHERE_LINKER_LIBS ${FOLLY_LIBRARIES})
 
 add_library(knowhere SHARED ${KNOWHERE_SRCS})
diff --git a/cmake/libs/libdiskann.cmake b/cmake/libs/libdiskann.cmake
index 58ec83601..75b5d4c64 100644
--- a/cmake/libs/libdiskann.cmake
+++ b/cmake/libs/libdiskann.cmake
@@ -28,6 +28,7 @@ target_link_libraries(diskann PUBLIC ${AIO_LIBRARIES}
                                      ${DISKANN_BOOST_PROGRAM_OPTIONS_LIB}
                                      nlohmann_json::nlohmann_json
                                      Folly::folly
+                                     fmt::fmt-header-only
                                      glog::glog)
 if(__X86_64)
   target_compile_options(
diff --git a/conanfile.py b/conanfile.py
index 920871819..00078e472 100644
--- a/conanfile.py
+++ b/conanfile.py
@@ -19,8 +19,6 @@ class KnowhereConan(ConanFile):
     homepage = "https://github.com/milvus-io/knowhere"
     license = "Apache-2.0"
 
-    generators = {"pkg_config","cmake_find_package"}
-
     settings = "os", "arch", "compiler", "build_type"
     options = {
         "shared": [True, False],
@@ -157,9 +155,13 @@ def generate(self):
         tc.variables["WITH_BENCHMARK"] = self.options.with_benchmark
         tc.variables["WITH_COVERAGE"] = self.options.with_coverage
         tc.generate()
+
         deps = CMakeDeps(self)
         deps.generate()
 
+        pc = PkgConfigDeps(self)
+        pc.generate()
+
     def build(self):
         # files.apply_conandata_patches(self)
         cmake = CMake(self)