From 33914bcceb73c9d16c672d7112ea83b434459f2a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B8rgen=20Kvalsvk?= Date: Tue, 16 Sep 2014 11:37:59 +0000 Subject: [PATCH] Removes broken conditional check. The FindPetsc module would check for a PETSC_ROOT and not attempt to look for mpi and the petsc header if this was not set, which it in most cases won't be. If the variable is set then the conditional include is redundant, as it will search the explicitly passed paths first anyways. --- cmake/Modules/FindPetsc.cmake | 4 ---- 1 file changed, 4 deletions(-) diff --git a/cmake/Modules/FindPetsc.cmake b/cmake/Modules/FindPetsc.cmake index ab45ffb53..63c2b652b 100644 --- a/cmake/Modules/FindPetsc.cmake +++ b/cmake/Modules/FindPetsc.cmake @@ -67,24 +67,20 @@ if (Petsc_ROOT) set (PETSC_ROOT "${Petsc_ROOT}") endif (Petsc_ROOT) if (NOT PETSC_NORMAL_INCLUDE_DIR) - if (PETSC_ROOT) find_path (PETSC_NORMAL_INCLUDE_DIR NAMES "petsc.h" PATHS ${PETSC_ROOT} PATH_SUFFIXES "petsc-3.4.4" "include" NO_DEFAULT_PATH ) - endif (PETSC_ROOT) endif (NOT PETSC_NORMAL_INCLUDE_DIR) if (NOT PETSC_MPIUNI_INCLUDE_DIR) - if (PETSC_ROOT) find_path (PETSC_MPIUNI_INCLUDE_DIR NAMES "mpi.h" PATHS ${PETSC_ROOT}/include PATH_SUFFIXES "mpiuni" NO_DEFAULT_PATH ) - endif (PETSC_ROOT) endif (NOT PETSC_MPIUNI_INCLUDE_DIR) # look for actual Petsc library if (NOT PETSC_LIBRARY)