adjustments for eclipse support in opm-common

This commit is contained in:
Arne Morten Kvarving 2018-03-05 13:05:46 +01:00
parent 28c7cdc293
commit 3cd39df141
3 changed files with 8 additions and 9 deletions

View File

@ -10,4 +10,4 @@ Label: 2018.04-pre
Maintainer: arne.morten.kvarving@sintef.no
MaintainerName: Arne Morten Kvarving
Url: http://opm-project.org
Depends: dune-common (>= 2.4) dune-grid (>= 2.4) dune-istl (>= 2.4) opm-parser opm-common opm-output opm-grid
Depends: dune-common (>= 2.4) dune-grid (>= 2.4) dune-istl (>= 2.4) opm-common opm-grid

View File

@ -1,20 +1,16 @@
#!/bin/bash
declare -a upstreams
upstreams=(opm-common
libecl
opm-parser
opm-output
upstreams=(libecl
opm-common
opm-material
opm-grid)
declare -A upstreamRev
upstreamRev[opm-common]=master
upstreamRev[libecl]=master
upstreamRev[opm-parser]=master
upstreamRev[opm-common]=master
upstreamRev[opm-material]=master
upstreamRev[opm-grid]=master
upstreamRev[opm-output]=master
if grep -q "opm-common=" <<< $ghprbCommentBody
then

View File

@ -24,7 +24,10 @@ set (opm-upscaling_DEPS
"dune-grid REQUIRED"
"opm-common REQUIRED"
"opm-grid REQUIRED"
"opm-output REQUIRED"
)
find_package_deps(opm-upscaling)
if(NOT HAVE_ECL_INPUT OR NOT HAVE_ECL_OUTPUT)
message(FATAL_ERROR "Eclipse input/output support required in opm-common")
endif()