Skip to content
Snippets Groups Projects
Commit 70d4fda1 authored by Christophe Geuzaine's avatar Christophe Geuzaine
Browse files

when PETSC_DIR/SLEPC_DIR are used, don't look for the libs in standard locations - fixes #263

parent a015a8c5
Branches
Tags
No related merge requests found
...@@ -985,7 +985,8 @@ if(HAVE_SOLVER) ...@@ -985,7 +985,8 @@ if(HAVE_SOLVER)
${ENV_PETSC_DIR}/${ENV_PETSC_ARCH}/lib "") ${ENV_PETSC_DIR}/${ENV_PETSC_ARCH}/lib "")
# petsc 3.1 creates only one library (libpetsc) # petsc 3.1 creates only one library (libpetsc)
if(NOT PETSC_LIBS) if(NOT PETSC_LIBS)
find_library(PETSC_LIBS petsc PATHS ${ENV_PETSC_DIR}/${ENV_PETSC_ARCH}/lib) find_library(PETSC_LIBS petsc PATHS ${ENV_PETSC_DIR}/${ENV_PETSC_ARCH}/lib
NO_DEFAULT_PATH)
endif(NOT PETSC_LIBS) endif(NOT PETSC_LIBS)
if(PETSC_LIBS) if(PETSC_LIBS)
set_config_option(HAVE_PETSC "PETSc") set_config_option(HAVE_PETSC "PETSc")
...@@ -1003,17 +1004,18 @@ if(HAVE_SOLVER) ...@@ -1003,17 +1004,18 @@ if(HAVE_SOLVER)
else(SLEPC_DIR) else(SLEPC_DIR)
set(ENV_SLEPC_DIR $ENV{SLEPC_DIR}) set(ENV_SLEPC_DIR $ENV{SLEPC_DIR})
endif(SLEPC_DIR) endif(SLEPC_DIR)
find_library(SLEPC_LIB slepc PATHS ${ENV_SLEPC_DIR}/${ENV_PETSC_ARCH}/lib) find_library(SLEPC_LIB slepc PATHS ${ENV_SLEPC_DIR}/${ENV_PETSC_ARCH}/lib
NO_DEFAULT_PATH)
if(SLEPC_LIB) if(SLEPC_LIB)
find_path(SLEPC_INC "slepc.h" PATHS ${ENV_SLEPC_DIR} PATH_SUFFIXES include find_path(SLEPC_INC "slepc.h" PATHS ${ENV_SLEPC_DIR} PATH_SUFFIXES include
${ENV_PETSC_ARCH}/include include/slepc) ${ENV_PETSC_ARCH}/include include/slepc NO_DEFAULT_PATH)
if(SLEPC_INC) if(SLEPC_INC)
message(STATUS "Using SLEPc dir: ${ENV_SLEPC_DIR}") message(STATUS "Using SLEPc dir: ${ENV_SLEPC_DIR}")
set_config_option(HAVE_SLEPC "SLEPc") set_config_option(HAVE_SLEPC "SLEPc")
list(APPEND EXTERNAL_LIBRARIES ${SLEPC_LIB}) list(APPEND EXTERNAL_LIBRARIES ${SLEPC_LIB})
list(APPEND EXTERNAL_INCLUDES ${SLEPC_INC}) list(APPEND EXTERNAL_INCLUDES ${SLEPC_INC})
find_path(SLEPC_INC2 "slepcconf.h" PATHS ${ENV_SLEPC_DIR} find_path(SLEPC_INC2 "slepcconf.h" PATHS ${ENV_SLEPC_DIR}
PATH_SUFFIXES ${ENV_PETSC_ARCH}/include) PATH_SUFFIXES ${ENV_PETSC_ARCH}/include NO_DEFAULT_PATH)
if(SLEPC_INC2) if(SLEPC_INC2)
list(APPEND EXTERNAL_INCLUDES ${SLEPC_INC2}) list(APPEND EXTERNAL_INCLUDES ${SLEPC_INC2})
endif(SLEPC_INC2) endif(SLEPC_INC2)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment