From 1f8b7d9bb670617715f7769e98db46c5f7a559db Mon Sep 17 00:00:00 2001
From: Bernd Flemisch <bernd@iws.uni-stuttgart.de>
Date: Mon, 18 Jun 2018 14:38:04 +0200
Subject: [PATCH] [cornerpoint] add patch for opm-common
See https://github.com/OPM/opm-common/pull/302. Can be removed if
cherry-picked to OPM's 2018.04 release branch.
---
patches/README | 7 +++----
patches/opm-common-2018.04.patch | 32 ++++++++++++++++++++++++++++++++
2 files changed, 35 insertions(+), 4 deletions(-)
create mode 100644 patches/opm-common-2018.04.patch
diff --git a/patches/README b/patches/README
index cc8f37bd91..0b676d8374 100644
--- a/patches/README
+++ b/patches/README
@@ -5,9 +5,8 @@
patch -p1 <../dumux/patches/istl-2.4.1.patch
- If opm-grid has to be used for, e.g., employing the CpGridCreator,
- and Opm is compiled from source, it is necessary to patch opm-grid:
+ and Opm is compiled from source, it is necessary to patch opm-common and
+ opm-grid, namely, to execute in the corresponding folders:
+ patch -p1 <../dumux/patches/opm-common-2018.04.patch
patch -p1 <../dumux/patches/opm-grid-2018.04.patch
- In addition, it might be necessary to set manually a CMake variable in the
- CMAKE_FLAGS section of the .opts-file:
- -DHAVE_OPM_GRID=1 \
Currently, Dumux is supposed to be compatible with the Opm 2018.04 release.
diff --git a/patches/opm-common-2018.04.patch b/patches/opm-common-2018.04.patch
new file mode 100644
index 0000000000..f20218a28d
--- /dev/null
+++ b/patches/opm-common-2018.04.patch
@@ -0,0 +1,32 @@
+diff --git a/cmake/Modules/OpmProject.cmake b/cmake/Modules/OpmProject.cmake
+index 51d572df..68feda08 100644
+--- a/cmake/Modules/OpmProject.cmake
++++ b/cmake/Modules/OpmProject.cmake
+@@ -76,6 +76,7 @@ function (opm_cmake_config name)
+ set (template_dir "${OPM_MACROS_ROOT}/cmake/Templates")
+
+ # write configuration file to locate library
++ set(DUNE_PREFIX ${PROJECT_SOURCE_DIR})
+ set(OPM_PROJECT_EXTRA_CODE ${OPM_PROJECT_EXTRA_CODE_INTREE})
+ set(PREREQ_LOCATION "${PROJECT_SOURCE_DIR}")
+ configure_cmake_file (${name} "config" "")
+@@ -123,6 +124,7 @@ function (opm_cmake_config name)
+ # of the build directory (using the same input template)
+ set(OPM_PROJECT_EXTRA_CODE ${OPM_PROJECT_EXTRA_CODE_INSTALLED})
+ set(PREREQ_LOCATION "${CMAKE_INSTALL_PREFIX}/share/opm/cmake/Modules")
++ set(DUNE_PREFIX ${CMAKE_INSTALL_PREFIX})
+ configure_cmake_file (${name} "install" "")
+ configure_vars (
+ FILE CMAKE "${PROJECT_BINARY_DIR}/${${name}_NAME}-install.cmake"
+diff --git a/cmake/Templates/opm-project-config.cmake.in b/cmake/Templates/opm-project-config.cmake.in
+index 421708a8..a783043d 100644
+--- a/cmake/Templates/opm-project-config.cmake.in
++++ b/cmake/Templates/opm-project-config.cmake.in
+@@ -24,6 +24,7 @@ if(NOT @opm-project_NAME@_FOUND)
+ set(CMAKE_MODULE_PATH "${CMAKE_MODULE_PATH}" @PREREQ_LOCATION@)
+ include(@opm-project_NAME@-prereqs)
+ # propagate these properties from one build system to the other
++ set (@opm-project_NAME@_PREFIX "@DUNE_PREFIX@")
+ set (@opm-project_NAME@_VERSION "@opm-project_VERSION@")
+ set (@opm-project_NAME@_DEFINITIONS "@opm-project_DEFINITIONS@")
+ set (@opm-project_NAME@_INCLUDE_DIRS "@opm-project_INCLUDE_DIRS@")
--
GitLab