OilfieldToolsNet/opm-core
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

FindPets searches default paths w/ general namings

Browse Source 
Removed the NO_DEFAULT_PATH flag as this really isn't working for most systems
(where PETSc will be installed from a repository and in /usr or /). Path suffix
parameters extended to accept more version-less configs too, to be compatible
with a default PETSc (debian style) install.
This commit is contained in:
Jørgen Kvalsvk 2014-09-16 11:39:18 +00:00
parent 3204518bcc
commit b595dd0abd
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
cmake/Modules/FindPetsc.cmake
View File

@ -70,16 +70,14 @@ if (NOT PETSC_NORMAL_INCLUDE_DIR)
find_path (PETSC_NORMAL_INCLUDE_DIR
NAMES "petsc.h"
PATHS ${PETSC_ROOT}
PATH_SUFFIXES "petsc-3.4.4" "include"
NO_DEFAULT_PATH
PATH_SUFFIXES "petsc-3.4.4" "include" "petsc"
)
endif (NOT PETSC_NORMAL_INCLUDE_DIR)
if (NOT PETSC_MPIUNI_INCLUDE_DIR)
find_path (PETSC_MPIUNI_INCLUDE_DIR
NAMES "mpi.h"
PATHS ${PETSC_ROOT}/include
PATH_SUFFIXES "mpiuni"
NO_DEFAULT_PATH
PATHS ${PETSC_ROOT}
PATH_SUFFIXES "mpiuni" "mpi"
)
endif (NOT PETSC_MPIUNI_INCLUDE_DIR)
# look for actual Petsc library
@ -88,7 +86,6 @@ if (NOT PETSC_LIBRARY)
NAMES "petsc-3.4.3" "petsc-3.4.4" "petsc"
PATHS ${PETSC_ROOT}
PATH_SUFFIXES "lib" "lib${_BITS}" "lib/${CMAKE_LIBRARY_ARCHITECTURE}"
NO_DEFAULT_PATH
)
endif()
if(NOT PETSC_LIBRARY)