From 68dd6d0f19b669c29b60ebcc4fd069f8e8cd5d33 Mon Sep 17 00:00:00 2001
From: Christoph Junghans <junghans@lanl.gov>
Date: Thu, 23 Apr 2020 09:20:38 -0600
Subject: [PATCH] cmake: move kim-api detection to cmake config

---
 cmake/LAMMPSConfig.cmake.in      |  4 ++--
 cmake/Modules/Packages/KIM.cmake | 18 ++++++++----------
 2 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/cmake/LAMMPSConfig.cmake.in b/cmake/LAMMPSConfig.cmake.in
index 7cd782b3b8..969bd6e929 100644
--- a/cmake/LAMMPSConfig.cmake.in
+++ b/cmake/LAMMPSConfig.cmake.in
@@ -20,8 +20,8 @@ if(NOT @BUILD_SHARED_LIBS@)
     find_dependency(ZLIB REQUIRED)
   endif()
   if(@PKG_KIM@)
-    find_dependency(PkgConfig REQUIRED)
-    pkg_check_modules(KIM-API REQUIRED IMPORTED_TARGET libkim-api>=@KIM-API_MIN_VERSION@)
+    find_package(KIM-API @KIM-API_MIN_VERSION@ CONFIG REQUIRED)
+    add_kim_api_imported_library()
     if(@CURL_FOUND@)
       find_dependency(CURL REQUIRED)
     endif()
diff --git a/cmake/Modules/Packages/KIM.cmake b/cmake/Modules/Packages/KIM.cmake
index b4e1fb3502..2a9cb739f7 100644
--- a/cmake/Modules/Packages/KIM.cmake
+++ b/cmake/Modules/Packages/KIM.cmake
@@ -14,13 +14,11 @@ if(CURL_FOUND)
     target_compile_definitions(lammps PRIVATE -DLMP_NO_SSL_CHECK)
   endif()
 endif()
-find_package(PkgConfig QUIET)
-set(DOWNLOAD_KIM_DEFAULT ON)
-if(PKG_CONFIG_FOUND)
-  pkg_check_modules(KIM-API QUIET libkim-api>=${KIM-API_MIN_VERSION})
-  if(KIM-API_FOUND)
-    set(DOWNLOAD_KIM_DEFAULT OFF)
-  endif()
+find_package(KIM-API ${KIM-API_MIN_VERSION} CONFIG)
+if(KIM-API_FOUND)
+  set(DOWNLOAD_KIM_DEFAULT OFF)
+else()
+  set(DOWNLOAD_KIM_DEFAULT ON)
 endif()
 option(DOWNLOAD_KIM "Download KIM-API from OpenKIM instead of using an already installed one" ${DOWNLOAD_KIM_DEFAULT})
 if(DOWNLOAD_KIM)
@@ -55,7 +53,7 @@ if(DOWNLOAD_KIM)
     install(CODE "MESSAGE(FATAL_ERROR \"Installing liblammps with downloaded libraries is currently not supported.\")")
   endif()
 else()
-  find_package(PkgConfig REQUIRED)
-  pkg_check_modules(KIM-API REQUIRED IMPORTED_TARGET libkim-api>=${KIM-API_MIN_VERSION})
-  target_link_libraries(lammps PRIVATE PkgConfig::KIM-API)
+  find_package(KIM-API ${KIM-API_MIN_VERSION} CONFIG REQUIRED)
+  add_kim_api_imported_library()
+  target_link_libraries(lammps PRIVATE kim-api)
 endif()