From cd77f71e99aefa5bd57ffc91bc36de26f390af6b Mon Sep 17 00:00:00 2001 From: Christoph Junghans Date: Thu, 15 Aug 2019 12:56:15 -0600 Subject: [PATCH] cmake: add version check for kim-api --- cmake/Modules/FindKIM-API.cmake | 28 +++++++++++++++++++++++++++- cmake/Modules/Packages/KIM.cmake | 4 ++-- 2 files changed, 29 insertions(+), 3 deletions(-) diff --git a/cmake/Modules/FindKIM-API.cmake b/cmake/Modules/FindKIM-API.cmake index 5108b0f98c..4185d1ac5a 100644 --- a/cmake/Modules/FindKIM-API.cmake +++ b/cmake/Modules/FindKIM-API.cmake @@ -37,6 +37,26 @@ # KIM-API-CMAKE_Fortran_COMPILER # +function(_KIMAPI_GET_VERSION _OUT_ver _version_hdr) + if(NOT EXISTS ${_version_hdr}) + message(FATAL_ERROR "Header file ${_version_hdr} not found (check value of KIM-API_INCLUDE_DIR)") + endif() + foreach(_var KIM_VERSION_MAJOR KIM_VERSION_MINOR KIM_VERSION_PATCH) + file(STRINGS ${_version_hdr} _contents REGEX "#define ${_var}[ \t]+") + if(_contents) + string(REGEX REPLACE ".*#define ${_var}[ \t]+([0-9.]+).*" "\\1" _${_var} "${_contents}") + if(NOT ${_${_var}}) + message(FATAL_ERROR "Version parsing failed for ${_var} in ${_version_hdr}, got empty return!") + elseif(NOT ${_${_var}} MATCHES "^[0-9]+$") + message(FATAL_ERROR "Version parsing failed for ${_var} in ${_version_hdr}, excepted a number but got ${_${_var}}!") + endif() + else() + message(FATAL_ERROR "No ${_var} line found in include file ${_version_hdr}") + endif() + endforeach() + set(${_OUT_ver} ${_KIM_VERSION_MAJOR}.${_KIM_VERSION_MINOR}.${_KIM_VERSION_PATCH} PARENT_SCOPE) +endfunction() + if(KIM-API_FIND_QUIETLY) set(REQ_OR_QUI "QUIET") else() @@ -54,6 +74,12 @@ if(KIM-API_FOUND) pkg_get_variable(KIM-API_CMAKE_Fortran_COMPILER libkim-api CMAKE_Fortran_COMPILER) endif() +if(KIM-API_INCLUDEDIR) + _KIMAPI_GET_VERSION(KIM-API_VERSION ${KIM-API_INCLUDEDIR}/KIM_Version.h) +else() + set(KIM-API_VERSION 0) +endif() + # handle the QUIETLY and REQUIRED arguments and set KIM-API_FOUND to TRUE # if all listed variables are TRUE -find_package_handle_standard_args(KIM-API REQUIRED_VARS KIM-API_LIBRARIES) +find_package_handle_standard_args(KIM-API REQUIRED_VARS KIM-API_LIBRARIES VERSION_VAR KIM-API_VERSION) diff --git a/cmake/Modules/Packages/KIM.cmake b/cmake/Modules/Packages/KIM.cmake index 31586bfbe0..259d8f057c 100644 --- a/cmake/Modules/Packages/KIM.cmake +++ b/cmake/Modules/Packages/KIM.cmake @@ -5,7 +5,7 @@ if(PKG_KIM) list(APPEND LAMMPS_LINK_LIBS ${CURL_LIBRARIES}) add_definitions(-DLMP_KIM_CURL) endif() - find_package(KIM-API QUIET) + find_package(KIM-API 2.1 QUIET) if(KIM-API_FOUND) set(DOWNLOAD_KIM_DEFAULT OFF) else() @@ -42,7 +42,7 @@ if(PKG_KIM) set(KIM-API_LDFLAGS ${INSTALL_DIR}/${CMAKE_INSTALL_LIBDIR}/libkim-api${CMAKE_SHARED_LIBRARY_SUFFIX}) list(APPEND LAMMPS_DEPS kim_build) else() - find_package(KIM-API REQUIRED) + find_package(KIM-API 2.1 REQUIRED) endif() list(APPEND LAMMPS_LINK_LIBS "${KIM-API_LDFLAGS}") include_directories(${KIM-API_INCLUDE_DIRS})