From e6fa5daa39fee8a64b581b47eb7ace86b22752c6 Mon Sep 17 00:00:00 2001 From: Arne Morten Kvarving Date: Wed, 18 Mar 2026 11:04:13 +0100 Subject: [PATCH] explicitly check for dune-uggrid needed for dune-grid 2.9 built with ug support --- CMakeLists.txt | 4 ++++ opm-grid-prereqs.cmake | 5 +++++ 2 files changed, 9 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 38781a187..255313ef4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -51,6 +51,10 @@ macro(opm-grid_prereqs_hook) target_compile_definitions(opmgrid PUBLIC HAVE_DUNE_ISTL=1) endif() + if(TARGET duneuggrid) + target_link_libraries(opmgrid PUBLIC duneuggrid) + endif() + if(TARGET Zoltan::Zoltan) target_link_libraries(opmgrid PUBLIC Zoltan::Zoltan) target_compile_definitions(opmgrid PUBLIC HAVE_ZOLTAN=1) diff --git a/opm-grid-prereqs.cmake b/opm-grid-prereqs.cmake index c9f0aef80..093490e54 100644 --- a/opm-grid-prereqs.cmake +++ b/opm-grid-prereqs.cmake @@ -6,6 +6,7 @@ find_package(dune-grid REQUIRED) # Use compile definitions to decide which packages are required. if(TARGET opmgrid) get_property(opm-grid_COMPILE_DEFINITIONS TARGET opmgrid PROPERTY INTERFACE_COMPILE_DEFINITIONS) + get_property(opm-grid_LIBS TARGET opmgrid PROPERTY INTERFACE_LINK_LIBRARIES) if(opm-grid_COMPILE_DEFINITIONS MATCHES HAVE_MPI) find_package(MPI REQUIRED) endif() @@ -18,9 +19,13 @@ if(TARGET opmgrid) if(opm-grid_COMPILE_DEFINITIONS MATCHES HAVE_METIS) find_package(METIS REQUIRED) endif() + if(opm-grid_LIBS MATCHES duneuggrid) + find_package(dune-uggrid REQUIRED) + endif() else() # Used in the opm-grid build system. These are optional # so no required flag here. + find_package(dune-uggrid) find_package(MPI) find_package(dune-istl) find_package(ZOLTAN)