OilfieldToolsNet/IFEM
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed: major / minor confusion

Browse Source 
we mean to check the minor version

git-svn-id: http://svn.sintef.no/trondheim/IFEM/trunk@1575 e10b68d5-8a6e-419e-a041-bce267b0401d
This commit is contained in:
akva
2012-04-12 08:06:08 +00:00
committed by Knut Morten Okstad
parent 93fbaaa052
commit bceb0243ec
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
cmake/Modules/FindPetsc.cmake
View File

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