From bceb0243ec207866ce564c14fb0bff68464692d2 Mon Sep 17 00:00:00 2001 From: akva Date: Thu, 12 Apr 2012 08:06:08 +0000 Subject: [PATCH] fixed: major / minor confusion we mean to check the minor version git-svn-id: http://svn.sintef.no/trondheim/IFEM/trunk@1575 e10b68d5-8a6e-419e-a041-bce267b0401d --- cmake/Modules/FindPetsc.cmake | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cmake/Modules/FindPetsc.cmake b/cmake/Modules/FindPetsc.cmake index ce229bcf..d242a4a5 100644 --- a/cmake/Modules/FindPetsc.cmake +++ b/cmake/Modules/FindPetsc.cmake @@ -21,7 +21,7 @@ STRING(REGEX MATCH "PETSC_VERSION_MINOR *([0-9]+)" PETSC_VERSION_MINOR ${PETSC_H STRING(REGEX REPLACE "PETSC_VERSION_MINOR *([0-9]+)" "\\1" PETSC_VERSION_MINOR "${PETSC_VERSION_MINOR}") # Add a better check when we need it (e.g. release is bumped) -IF(PETSC_VERSION_MAJOR LESS 2) +IF(PETSC_VERSION_MINOR LESS 2) FIND_LIBRARY(PETSC_LIB_PETSC petsc PATHS /usr/lib $ENV{PETSC_DIR}/$ENV{PETSC_ARCH}/lib) FIND_LIBRARY(PETSC_LIB_PETSCDM petscdm PATHS /usr/lib $ENV{PETSC_DIR}/$ENV{PETSC_ARCH}/lib) FIND_LIBRARY(PETSC_LIB_PETSCVEC petscvec PATHS /usr/lib $ENV{PETSC_DIR}/$ENV{PETSC_ARCH}/lib) @@ -68,10 +68,10 @@ IF(PETSC_VERSION_MAJOR LESS 2) SET(PETSCCONF_INCLUDE_DIR ${PETSCCONF_INCLUDE_DIR} ${PETSC_VARIABLES}) SET(PETSC_INCLUDES ${PETSC_INCLUDE_DIR} ${PETSCCONF_INCLUDE_DIR}) -ELSE(PETSC_VERSION_MAJOR LESS 2) +ELSE(PETSC_VERSION_MINOR LESS 2) INCLUDE($ENV{PETSC_DIR}/$ENV{PETSC_ARCH}/conf/PETScConfig.cmake) FIND_LIBRARY(PETSC_LIB_PETSC petsc HINTS $ENV{PETSC_DIR}/$ENV{PETSC_ARCH}/lib) SET(PETSC_LIBRARIES ${PETSC_LIB_PETSC} ${PETSC_PACKAGE_LIBS}) SET(PETSC_INCLUDES ${PETSC_INCLUDE_DIR} ${PETSCCONF_INCLUDE_DIR} ${PETSC_PACKAGE_INCLUDES}) -ENDIF(PETSC_VERSION_MAJOR LESS 2) +ENDIF(PETSC_VERSION_MINOR LESS 2) MARK_AS_ADVANCED(PETSC_LIBRARIES PETSC_INCLUDES)