ICODE-ADC/lammps
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cmake: move kim-api detection to cmake config

Browse Source
This commit is contained in:
Christoph Junghans
2020-04-23 09:20:38 -06:00
parent 0711232e5b
commit 68dd6d0f19
2 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cmake/LAMMPSConfig.cmake.in
View File

@ -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()

18
cmake/Modules/Packages/KIM.cmake
View File

@ -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()