From 25cfd0632f423c5485979d45e7f14ccf54c07877 Mon Sep 17 00:00:00 2001 From: maier Date: Thu, 4 Oct 2012 21:17:44 +0000 Subject: [PATCH] Bugfix: Unset Metis if it is not a suitable version git-svn-id: https://svn.dealii.org/branches/branch_cmake@26959 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/cmake/configure/configure_metis.cmake | 4 ++++ deal.II/cmake/modules/FindMETIS.cmake | 7 ++----- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/deal.II/cmake/configure/configure_metis.cmake b/deal.II/cmake/configure/configure_metis.cmake index dba4ba4f5a..60f3f6f6f4 100644 --- a/deal.II/cmake/configure/configure_metis.cmake +++ b/deal.II/cmake/configure/configure_metis.cmake @@ -27,6 +27,10 @@ MACRO(FEATURE_METIS_FIND_EXTERNAL var) "Could not find a sufficient modern metis installation: " "Version 5.x required!\n\n" ) + UNSET(METIS_LIBRARY CACHE) + UNSET(METIS_INCLUDE_DIR CACHE) + UNSET(METIS_DIR CACHE) + UNSET(METIS_FOUND CACHE) ENDIF() ENDMACRO() diff --git a/deal.II/cmake/modules/FindMETIS.cmake b/deal.II/cmake/modules/FindMETIS.cmake index 8c484833ab..285ba64563 100644 --- a/deal.II/cmake/modules/FindMETIS.cmake +++ b/deal.II/cmake/modules/FindMETIS.cmake @@ -21,11 +21,8 @@ INCLUDE(FindPackageHandleStandardArgs) SET_IF_EMPTY(METIS_DIR "$ENV{METIS_DIR}") # -# Metis (at least up to version 4.*) is usually pretty self contained. So -# no external dependencies so far. -# -# TODO: What about metis-5.* (e.g. coming from parmetis) This could have -# deps on pcre and mpi... +# TODO: Metis is usually pretty self contained. So no external dependencies +# so far... BUt there could be dependencies on pcre and mpi... # FIND_PATH(METIS_INCLUDE_DIR metis.h -- 2.39.5