Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Bård Skaflestad 2013-09-10 23:42:43 +02:00
commit a4b80532f6

View File

@ -13,6 +13,8 @@ set (opm-material_DEPS
"C99"
# compile with C++0x/11 support if available
"CXX11Features REQUIRED"
# prerequisite OPM modules
"opm-core REQUIRED"
# DUNE dependency
"dune-common REQUIRED"
"dune-istl REQUIRED"