From 264f62102115bdb2d83f28a7c7cf324f08389c22 Mon Sep 17 00:00:00 2001
From: Robert Kloefkorn <robert.kloefkorn@iris.no>
Date: Wed, 23 Nov 2016 13:55:07 +0100
Subject: [PATCH] Revert dependencies of opm-core and opm-grid. opm-core is not
 dependent on opm-grid.

---
 cmake/Modules/ewoms-prereqs.cmake          |  1 +
 cmake/Modules/opm-core-prereqs.cmake       |  3 +++
 cmake/Modules/opm-grid-prereqs.cmake       | 11 +++--------
 cmake/Modules/opm-simulators-prereqs.cmake | 11 ++++++-----
 4 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/cmake/Modules/ewoms-prereqs.cmake b/cmake/Modules/ewoms-prereqs.cmake
index 565d57ed6..1dc096162 100644
--- a/cmake/Modules/ewoms-prereqs.cmake
+++ b/cmake/Modules/ewoms-prereqs.cmake
@@ -35,6 +35,7 @@ set (ewoms_DEPS
 	"dune-fem"
 	"opm-parser"
 	"opm-grid"
+	"opm-core"
 	# librt (on some systems necessary for clock_gettime())
 	"librt REQUIRED"
 	# valgrind client requests
diff --git a/cmake/Modules/opm-core-prereqs.cmake b/cmake/Modules/opm-core-prereqs.cmake
index fa4d9efa5..3e501710a 100644
--- a/cmake/Modules/opm-core-prereqs.cmake
+++ b/cmake/Modules/opm-core-prereqs.cmake
@@ -42,5 +42,8 @@ set (opm-core_DEPS
 	"opm-parser REQUIRED"
 	# the code which implements the material laws
 	"opm-material REQUIRED"
+	# the code which implements the output routines
 	"opm-output REQUIRED"
+	# the code which implements grids
+	"opm-grid REQUIRED"
 	)
diff --git a/cmake/Modules/opm-grid-prereqs.cmake b/cmake/Modules/opm-grid-prereqs.cmake
index 7cb542f7d..4a039772d 100644
--- a/cmake/Modules/opm-grid-prereqs.cmake
+++ b/cmake/Modules/opm-grid-prereqs.cmake
@@ -9,9 +9,6 @@ set (opm-grid_CONFIG_VAR
 	DUNE_COMMON_VERSION_MAJOR
 	DUNE_COMMON_VERSION_MINOR
 	DUNE_COMMON_VERSION_REVISION
-	DUNE_ISTL_VERSION_MAJOR
-	DUNE_ISTL_VERSION_MINOR
-	DUNE_ISTL_VERSION_REVISION
 	HAVE_ZOLTAN
 	)
 
@@ -27,10 +24,8 @@ set (opm-grid_DEPS
 	# DUNE dependency
 	"dune-common REQUIRED;
    dune-grid REQUIRED;
-   dune-geometry REQUIRED
-	 dune-istl"
-	# OPM dependency
-  "opm-common REQUIRED;
-   opm-core REQUIRED"
+	 dune-geometry REQUIRED;
+   opm-common REQUIRED;
+	 opm-parser REQUIRED"
 	"ZOLTAN"
 	)
diff --git a/cmake/Modules/opm-simulators-prereqs.cmake b/cmake/Modules/opm-simulators-prereqs.cmake
index b873f490d..1fdb06ef9 100644
--- a/cmake/Modules/opm-simulators-prereqs.cmake
+++ b/cmake/Modules/opm-simulators-prereqs.cmake
@@ -20,12 +20,13 @@ set (opm-simulators_DEPS
 	"dune-common REQUIRED;
 	dune-istl REQUIRED"
 	"ERTPython"
-        # OPM dependency
+  # OPM dependency
 	"opm-common REQUIRED;
-        opm-parser REQUIRED;
-	opm-core REQUIRED;
-	opm-output REQUIRED;
-	opm-grid"
+   opm-parser REQUIRED;
+	 opm-grid REQUIRED;
+	 opm-core REQUIRED;
+	 opm-output REQUIRED;
+	 ewoms REQUIRED"
 	# Eigen
 	"Eigen3 3.2.0"
 	)