From 8775b7a82e2ba3206863fc6fbea0c6bd49dc0ee0 Mon Sep 17 00:00:00 2001 From: young Date: Wed, 31 Jul 2013 09:18:29 +0000 Subject: [PATCH] Checking PETSc-SLEPc compatibility is VERSION_SUBMINOR independent and way to restrictive if not respected. Check MAJOR and MINOR only then go ahead with config. git-svn-id: https://svn.dealii.org/trunk@30191 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/cmake/configure/configure_slepc.cmake | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/deal.II/cmake/configure/configure_slepc.cmake b/deal.II/cmake/configure/configure_slepc.cmake index 269f85daa1..c0d1b212b0 100644 --- a/deal.II/cmake/configure/configure_slepc.cmake +++ b/deal.II/cmake/configure/configure_slepc.cmake @@ -25,9 +25,14 @@ MACRO(FEATURE_SLEPC_FIND_EXTERNAL var) IF(SLEPC_FOUND) # - # Check whether SLEPc and PETSc are compatible. + # Check whether SLEPc and PETSc are compatible according to + # SLEPc's rules: This is equivalent to asking if the VERSION_MAJOR + # and VERSION_MINOR of PETSc and SLEPc are + # equivalent; and where VERSION_SUBMINORs are allowed to differ. # - IF("${SLEPC_VERSION}" STREQUAL "${PETSC_VERSION}") + IF( ("${SLEPC_VERSION_MAJOR}" STREQUAL "${PETSC_VERSION_MAJOR}") + AND + ("${SLEPC_VERSION_MINOR}" STREQUAL "${PETSC_VERSION_MINOR}")) SET(${var} TRUE) ELSE() -- 2.39.5