From 019f022c3c09b9181b768439bd42acbc2bf88562 Mon Sep 17 00:00:00 2001 From: akva Date: Wed, 2 Mar 2011 16:41:27 +0000 Subject: [PATCH] fixed: support non-mpi enabled petsc git-svn-id: http://svn.sintef.no/trondheim/IFEM/trunk@853 e10b68d5-8a6e-419e-a041-bce267b0401d --- CMakeLists.txt | 9 ++++++--- cmake/Modules/FindPetsc.cmake | 2 ++ 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 873b0827..598d6dbd 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -75,9 +75,12 @@ IF(PETSC_LIBRARIES AND PETSC_INCLUDE_DIR) SET(INCLUDES ${INCLUDES} ${PETSC_INCLUDE_DIR} ${PETSCCONF_INCLUDE_DIR}) SET(DEPLIBS ${DEPLIBS} ${PETSC_LIBRARIES}) SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DHAS_PETSC") - FIND_PACKAGE(MPI REQUIRED) - SET(INCLUDES ${INCLUDES} ${MPI_INCLUDE_PATH}) - SET(DEPLIBS ${DEPLIBS} ${MPI_LIBRARIES}) + IF(${ENABLE_PARALLEL_PETSC}) + FIND_PACKAGE(MPI REQUIRED) + SET(INCLUDES ${INCLUDES} ${MPI_INCLUDE_PATH}) + SET(DEPLIBS ${DEPLIBS} ${MPI_LIBRARIES}) + SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DPARALLEL_PETSC") + ENDIF(${ENABLE_PARALLEL_PETSC}) FIND_PACKAGE(SLEPc) IF(SLEPC_LIBRARIES AND SLEPC_INCLUDES) SET(INCLUDES ${INCLUDES} ${SLEPC_INCLUDES}) diff --git a/cmake/Modules/FindPetsc.cmake b/cmake/Modules/FindPetsc.cmake index 6a58168e..dbcf1edb 100644 --- a/cmake/Modules/FindPetsc.cmake +++ b/cmake/Modules/FindPetsc.cmake @@ -64,3 +64,5 @@ SET(PETSC_LIBRARIES ${PETSC_LIBRARIES} ${PETSC_VARIABLES}) exec_program("cat $ENV{PETSC_DIR}/$ENV{PETSC_ARCH}/conf/petscvariables | grep \"PCC_LINKER_LIBS =\"| awk -F ' = ' '{print $2}'" OUTPUT_VARIABLE PETSC_VARIABLES) SET(PETSC_LIBRARIES ${PETSC_LIBRARIES} ${PETSC_VARIABLES}) +exec_program("cat $ENV{PETSC_DIR}/$ENV{PETSC_ARCH}/conf/petscvariables | grep MPI_INCLUDE | awk -F '-I' '{print $2}'" OUTPUT_VARIABLE PETSC_VARIABLES) +SET(PETSCCONF_INCLUDE_DIR ${PETSCCONF_INCLUDE_DIR} ${PETSC_VARIABLES})