From: maier Date: Thu, 4 Oct 2012 21:18:05 +0000 (+0000) Subject: The same for PETSc and Trilinos X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=192361d67b2db8d6d12d99f214aab13a9115189f;p=dealii-svn.git The same for PETSc and Trilinos git-svn-id: https://svn.dealii.org/branches/branch_cmake@26960 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/cmake/configure/configure_petsc.cmake b/deal.II/cmake/configure/configure_petsc.cmake index d205b41fef..a3045cf8b1 100644 --- a/deal.II/cmake/configure/configure_petsc.cmake +++ b/deal.II/cmake/configure/configure_petsc.cmake @@ -56,6 +56,12 @@ MACRO(FEATURE_PETSC_FIND_EXTERNAL var) SET(${var} FALSE) ENDIF() + IF(NOT ${var}) + UNSET(PETSC_INCLUDE_DIR_ARCH CACHE) + UNSET(PETSC_INCLUDE_DIR_COMMON CACHE) + UNSET(PETSC_INCLUDE_DIRS CACHE) + UNSET(PETSC_LIBRARIES CACHE) + ENDIF() ENDIF() ENDMACRO() diff --git a/deal.II/cmake/configure/configure_trilinos.cmake b/deal.II/cmake/configure/configure_trilinos.cmake index 4d220425de..f8b93e28e0 100644 --- a/deal.II/cmake/configure/configure_trilinos.cmake +++ b/deal.II/cmake/configure/configure_trilinos.cmake @@ -155,6 +155,11 @@ MACRO(FEATURE_TRILINOS_FIND_EXTERNAL var) UNSET(TRILINOS_SUPPORTS_CPP11 CACHE) UNSET(TRILINOS_HAS_C99_TR1_WORKAROUND CACHE) + IF(NOT ${var}) + UNSET(TRILINOS_DIR CACHE) + UNSET(TRILINOS_INCLUDE_DIRS CACHE) + UNSET(TRILINOS_LIBRARIES CACHE) + ENDIF() ENDIF(TRILINOS_FOUND) ENDMACRO()