From 942de51957240a5fde144ce0277b7b5c7fa026b5 Mon Sep 17 00:00:00 2001 From: Christoph Junghans Date: Thu, 3 Jan 2019 03:39:04 -0700 Subject: [PATCH] gmxManageLmfit.cmake: enforce usage of 7.0 LMFIT_FOUND will also be true for version lower than 7.0, so we need to check the version explicitly in gmxManageLmfit.cmake. Change-Id: Ia3ae12b3a74d2b567432f5ef18a77c13b19cdb85 --- cmake/gmxManageLmfit.cmake | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/cmake/gmxManageLmfit.cmake b/cmake/gmxManageLmfit.cmake index 182928f127..6235ba4dec 100644 --- a/cmake/gmxManageLmfit.cmake +++ b/cmake/gmxManageLmfit.cmake @@ -1,7 +1,7 @@ # # This file is part of the GROMACS molecular simulation package. # -# Copyright (c) 2016, by the GROMACS development team, led by +# Copyright (c) 2016,2019, by the GROMACS development team, led by # Mark Abraham, David van der Spoel, Berk Hess, and Erik Lindahl, # and including many others, as listed in the AUTHORS file in the # top-level source directory and at http://www.gromacs.org. @@ -41,9 +41,9 @@ mark_as_advanced(GMX_EXTERNAL_LMFIT) macro(manage_lmfit) if(GMX_EXTERNAL_LMFIT) # Find an external lmfit library. - find_package(Lmfit ${GMX_LMFIT_MINIMUM_REQUIRED_VERSION}) - if(NOT LMFIT_FOUND) - message(FATAL_ERROR "External lmfit could not be found, please adjust your pkg-config path to include the lmfit.pc file") + find_package(Lmfit ${GMX_LMFIT_REQUIRED_VERSION}) + if(NOT LMFIT_FOUND OR LMFIT_VERSION VERSION_LESS GMX_LMFIT_REQUIRED_VERSION) + message(FATAL_ERROR "External lmfit >= ${GMX_LMFIT_REQUIRED_VERSION} could not be found, please adjust your pkg-config path to include the lmfit.pc file") endif() endif() endmacro() -- 2.11.4.GIT