From c1acffcd90a58a9e7ff1f9955a1cf099353bbdcf Mon Sep 17 00:00:00 2001
From: Roland Kaufmann <roland.kaufmann@uni.no>
Date: Wed, 7 Aug 2013 23:38:06 +0200
Subject: [PATCH] Upgrade Findopm-material to use separate prerequisite list

This will now be included both by the find module and by the project
file itself.
---
 cmake/Modules/Findopm-material.cmake     | 11 ++++-----
 cmake/Modules/opm-material-prereqs.cmake | 31 ++++++++++++++++++++++++
 2 files changed, 36 insertions(+), 6 deletions(-)
 create mode 100644 cmake/Modules/opm-material-prereqs.cmake

diff --git a/cmake/Modules/Findopm-material.cmake b/cmake/Modules/Findopm-material.cmake
index d01e9736..81844512 100644
--- a/cmake/Modules/Findopm-material.cmake
+++ b/cmake/Modules/Findopm-material.cmake
@@ -11,15 +11,15 @@
 # This code is licensed under The GNU General Public License v3.0
 
 # use the generic find routine
+include (opm-material-prereqs)
 include (OpmPackage)
 find_opm_package (
   # module name
   "opm-material"
 
   # dependencies
-  "C99;
-  CXX11Features
-  "
+  "${opm-material_DEPS}"
+
   # header to search for
   "opm/material/constants.hh"
 
@@ -37,8 +37,7 @@ int main (void) {
 }
 "
   # config variables
-  "HAVE_MPI;
-  HAVE_VALGRIND
-  ")
+  "${opm-material_CONFIG_VAR}"
+  )
 include (UseDynamicBoost)
 #debug_find_vars ("opm-material")
diff --git a/cmake/Modules/opm-material-prereqs.cmake b/cmake/Modules/opm-material-prereqs.cmake
new file mode 100644
index 00000000..f85175ea
--- /dev/null
+++ b/cmake/Modules/opm-material-prereqs.cmake
@@ -0,0 +1,31 @@
+# -*- mode: cmake; tab-width: 2; indent-tabs-mode: t; truncate-lines: t; compile-command: "cmake -Wdev" -*-
+# vim: set filetype=cmake autoindent tabstop=2 shiftwidth=2 noexpandtab softtabstop=2 nowrap:
+
+# defines that must be present in config.h for our headers
+set (opm-material_CONFIG_VAR
+	HAVE_NULLPTR
+	HAVE_ARRAY
+	HAVE_ATTRIBUTE_ALWAYS_INLINE
+	HAS_ATTRIBUTE_UNUSED
+	HAS_ATTRIBUTE_DEPRECATED
+	HAS_ATTRIBUTE_DEPRECATED_MSG
+	HAVE_CONSTEXPR
+	HAVE_INTEGRAL_CONSTANT
+	HAVE_STATIC_ASSERT
+	HAVE_VARIADIC_TEMPLATES
+	HAVE_VARIADIC_CONSTRUCTOR_SFINAE
+	HAVE_RVALUE_REFERENCES
+	HAVE_TUPLE
+	HAVE_TR1_TUPLE
+	)
+
+# dependencies
+set (opm-material_DEPS
+	# compile with C99 support if available
+	"C99"
+	# compile with C++0x/11 support if available
+	"CXX11Features REQUIRED"
+	# DUNE dependency
+	"dune-common"
+	"dune-istl"
+	)