From 15631d2ab147809147b55a1283ba7506285bb27f Mon Sep 17 00:00:00 2001 From: Andreas Lauser Date: Wed, 14 Aug 2013 23:16:25 +0200 Subject: [PATCH] FindALUGrid.cmake: incorperate Roland's comments to PR 317 --- cmake/Modules/FindALUGrid.cmake | 5 +++-- cmake/Modules/Finddune-grid.cmake | 4 +--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/cmake/Modules/FindALUGrid.cmake b/cmake/Modules/FindALUGrid.cmake index 21048d3c0..ecd15f38f 100644 --- a/cmake/Modules/FindALUGrid.cmake +++ b/cmake/Modules/FindALUGrid.cmake @@ -79,16 +79,17 @@ if (NOT ALUGRID_INCLUDE_DIR) endif() mark_as_advanced(ALUGRID_INCLUDE_DIR) -find_library(ALUGRID_LIBRARIES alugrid +find_library(ALUGRID_LIBRARY alugrid PATHS "${ALUGRID_ROOT}" PATH_SUFFIXES lib lib32 lib64 DOC "ALUGrid library" NO_DEFAULT_PATH) -if (NOT ALUGRID_LIBRARIES) +if (NOT ALUGRID_LIBRARY) message(STATUS "Could not find ALUGrid usable library") _opm_set_alugrid(0) return() endif() +set(ALUGRID_LIBRARIES ${ALUGRID_LIBRARY} ${METIS_LIBRARIES}) mark_as_advanced(ALUGRID_LIBRARIES) diff --git a/cmake/Modules/Finddune-grid.cmake b/cmake/Modules/Finddune-grid.cmake index 8aed2c762..dd04e0de6 100644 --- a/cmake/Modules/Finddune-grid.cmake +++ b/cmake/Modules/Finddune-grid.cmake @@ -23,8 +23,7 @@ find_opm_package ( dune-common REQUIRED; dune-geometry REQUIRED; MPI; - ALUGrid; - METIS + ALUGrid " # header to search for "dune/grid/onedgrid.hh" @@ -47,7 +46,6 @@ int main (void) { HAVE_UG; HAVE_DUNE_FEM; HAVE_ALUGRID; - HAVE_METIS; HAVE_GRIDTYPE; HAVE_GRAPE; HAVE_PSURFACE;