From c1b57461a1696363f48a128aefa840df4f83aee6 Mon Sep 17 00:00:00 2001 From: Markus Blatt Date: Mon, 9 Sep 2024 17:38:45 +0200 Subject: [PATCH 1/2] Removed HAVE_UMFPACK alias. This is not used even in DUNE 2.7 and we get annoying redefined warnings with it. --- cmake/Modules/OpmAliases.cmake | 1 - 1 file changed, 1 deletion(-) diff --git a/cmake/Modules/OpmAliases.cmake b/cmake/Modules/OpmAliases.cmake index 67c177c5e1d..6423a3bedc3 100644 --- a/cmake/Modules/OpmAliases.cmake +++ b/cmake/Modules/OpmAliases.cmake @@ -8,7 +8,6 @@ function (set_aliases) # hardcoded list of "dune-var opm-var" pairs, where the components # are separated by space set (aliases - "HAVE_UMFPACK HAVE_SUITESPARSE_UMFPACK_H" "HAVE_SUITESPARSE_UMFPACK HAVE_SUITESPARSE_UMFPACK_H" "HAVE_DUNE_BOOST HAVE_BOOST" ) From 1b1325213a4ebb87e32e5df01eed2f889f2b25c9 Mon Sep 17 00:00:00 2001 From: Markus Blatt Date: Mon, 9 Sep 2024 17:41:53 +0200 Subject: [PATCH 2/2] Workaround possibly set HAVE_DUNE_MODULE (DUNE 2.10). For 2.10 this is set by the *-config.cmake file to TRUE which suddenly resulted in ``` ``` appearing in config.h. As TRUE is not defined we would pretend that there is no dune-istl and compilation would fail where we pack BlockVectors for serialization. --- cmake/Modules/OpmPackage.cmake | 3 +++ 1 file changed, 3 insertions(+) diff --git a/cmake/Modules/OpmPackage.cmake b/cmake/Modules/OpmPackage.cmake index d47e6b21146..a8a12e07e99 100644 --- a/cmake/Modules/OpmPackage.cmake +++ b/cmake/Modules/OpmPackage.cmake @@ -136,6 +136,9 @@ macro (find_opm_package module deps header lib defs prog conf) # since we don't have any config.h yet list (APPEND CMAKE_REQUIRED_DEFINITIONS ${${module}_DEFINITIONS}) list (APPEND CMAKE_REQUIRED_DEFINITIONS ${${module}_CMD_CONFIG}) + if(HAVE_${MODULE} STREQUAL "TRUE") + set(HAVE_${MODULE} "") + endif() check_cxx_source_compiles ("${prog}" HAVE_${MODULE}) cmake_pop_check_state () else()