From: maier Date: Fri, 28 Sep 2012 23:02:14 +0000 (+0000) Subject: Make FindPETSC.cmake work with the gentoo petsc package X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d6a877be6ef4f12de8ca3f7bdfc55a41a6da0da1;p=dealii-svn.git Make FindPETSC.cmake work with the gentoo petsc package git-svn-id: https://svn.dealii.org/branches/branch_cmake@26873 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/cmake/modules/FindPETSC.cmake b/deal.II/cmake/modules/FindPETSC.cmake index cb32527e01..749d41a867 100644 --- a/deal.II/cmake/modules/FindPETSC.cmake +++ b/deal.II/cmake/modules/FindPETSC.cmake @@ -31,10 +31,13 @@ SET_IF_EMPTY(PETSC_ARCH "$ENV{PETSC_ARCH}") # heck? If its not the same library you're linking against, you cannot # assume to be API compatible, so why not just give a list of libraries? # +# - It is not even considered to be installed in the gentoo petsc package +# :-] +# # # TODO: We'll have to guess which external libraries we'll have to link -# against someday... +# against someday to avoid underlinkage # # @@ -43,6 +46,7 @@ SET_IF_EMPTY(PETSC_ARCH "$ENV{PETSC_ARCH}") FIND_PATH(PETSC_INCLUDE_DIR_ARCH petscconf.h HINTS # petsc is special. Account for that + ${PETSC_DIR} ${PETSC_DIR}/${PETSC_ARCH}/include ${PETSC_INCLUDE_DIRS} PATH_SUFFIXES petsc @@ -52,11 +56,11 @@ FIND_LIBRARY(PETSC_LIBRARIES NAMES petsc HINTS # petsc is special. Account for that + ${PETSC_DIR} ${PETSC_DIR}/${PETSC_ARCH} PATH_SUFFIXES lib${LIB_SUFFIX} lib64 lib ) - # # So, up to this point it was easy. Now, the tricky part. # If petsc is not installed, but a source tree is given by PETSC_DIR petsc @@ -93,23 +97,13 @@ ENDIF() FIND_FILE(PETSC_PETSCVERSION_H petscversion.h HINTS ${PETSC_INCLUDE_DIRS} - NO_DEFAULT_PATH - NO_CMAKE_ENVIRONMENT_PATH - NO_CMAKE_PATH - NO_SYSTEM_ENVIRONMENT_PATH - NO_CMAKE_SYSTEM_PATH - NO_CMAKE_FIND_ROOT_PATH + PATH_SUFFIXES petsc ) FIND_FILE(PETSC_PETSCCONF_H petscconf.h HINTS ${PETSC_INCLUDE_DIRS} - NO_DEFAULT_PATH - NO_CMAKE_ENVIRONMENT_PATH - NO_CMAKE_PATH - NO_SYSTEM_ENVIRONMENT_PATH - NO_CMAKE_SYSTEM_PATH - NO_CMAKE_FIND_ROOT_PATH + PATH_SUFFIXES petsc ) #