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

report which petsc/slepc we found

parent e70669fa
No related branches found
No related tags found
No related merge requests found
...@@ -495,7 +495,7 @@ if(HAVE_MESH OR HAVE_PLUGINS) ...@@ -495,7 +495,7 @@ if(HAVE_MESH OR HAVE_PLUGINS)
list(APPEND EXTERNAL_LIBRARIES ${ANN_LIB}) list(APPEND EXTERNAL_LIBRARIES ${ANN_LIB})
list(APPEND EXTERNAL_INCLUDES ${ANN_INC}) list(APPEND EXTERNAL_INCLUDES ${ANN_INC})
else(ANN_LIB AND ANN_INC) else(ANN_LIB AND ANN_INC)
message(STATUS "System ANN not found - using contrib/ANN instead") message(STATUS "System ANN not found: using contrib/ANN instead")
add_subdirectory(contrib/ANN) add_subdirectory(contrib/ANN)
include_directories(contrib/ANN/include) include_directories(contrib/ANN/include)
endif(ANN_LIB AND ANN_INC) endif(ANN_LIB AND ANN_INC)
...@@ -610,7 +610,7 @@ if(HAVE_MESH) ...@@ -610,7 +610,7 @@ if(HAVE_MESH)
list(APPEND EXTERNAL_LIBRARIES ${MMG3D_LIB}) list(APPEND EXTERNAL_LIBRARIES ${MMG3D_LIB})
list(APPEND EXTERNAL_INCLUDES ${MMG3D_INC}) list(APPEND EXTERNAL_INCLUDES ${MMG3D_INC})
else(MMG3D_LIB AND MMG3D_INC) else(MMG3D_LIB AND MMG3D_INC)
message(STATUS "System MMG3D not found - using contrib/mmg3d instead") message(STATUS "System MMG3D not found: using contrib/mmg3d instead")
add_subdirectory(contrib/mmg3d) add_subdirectory(contrib/mmg3d)
include_directories(contrib/mmg3d/build/sources) include_directories(contrib/mmg3d/build/sources)
endif(MMG3D_LIB AND MMG3D_INC) endif(MMG3D_LIB AND MMG3D_INC)
...@@ -693,7 +693,7 @@ if(HAVE_SOLVER) ...@@ -693,7 +693,7 @@ if(HAVE_SOLVER)
if(GMM_INC) if(GMM_INC)
list(APPEND EXTERNAL_INCLUDES ${GMM_INC}) list(APPEND EXTERNAL_INCLUDES ${GMM_INC})
else(GMM_INC) else(GMM_INC)
message(STATUS "System GMM not found - using contrib/gmm instead") message(STATUS "System GMM not found: using contrib/gmm instead")
include_directories(contrib/gmm) include_directories(contrib/gmm)
endif(GMM_INC) endif(GMM_INC)
set_config_option(HAVE_GMM "Gmm") set_config_option(HAVE_GMM "Gmm")
...@@ -729,6 +729,8 @@ if(HAVE_SOLVER) ...@@ -729,6 +729,8 @@ if(HAVE_SOLVER)
if(EXISTS ${ENV_PETSC_DIR}/${ENV_PETSC_ARCH}/conf/petscvariables) if(EXISTS ${ENV_PETSC_DIR}/${ENV_PETSC_ARCH}/conf/petscvariables)
# old-style PETSc installations (using PETSC_DIR and PETSC_ARCH) # old-style PETSc installations (using PETSC_DIR and PETSC_ARCH)
set_config_option(HAVE_PETSC "PETSc") set_config_option(HAVE_PETSC "PETSc")
message(STATUS "Using PETSc dir: ${ENV_PETSC_DIR}")
message(STATUS "Using PETSc arch: ${ENV_PETSC_ARCH}")
file(STRINGS ${ENV_PETSC_DIR}/${ENV_PETSC_ARCH}/conf/petscvariables file(STRINGS ${ENV_PETSC_DIR}/${ENV_PETSC_ARCH}/conf/petscvariables
PETSC_VARIABLES NEWLINE_CONSUME) PETSC_VARIABLES NEWLINE_CONSUME)
# find include directories # find include directories
...@@ -768,6 +770,7 @@ if(HAVE_SOLVER) ...@@ -768,6 +770,7 @@ if(HAVE_SOLVER)
${ENV_PETSC_ARCH}/include include/slepc) ${ENV_PETSC_ARCH}/include include/slepc)
if(SLEPC_INC) if(SLEPC_INC)
set_config_option(HAVE_SLEPC "SLEPc") set_config_option(HAVE_SLEPC "SLEPc")
message(STATUS "Using SLEPc dir: ${ENV_SLEPC_DIR}")
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}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment