diff --git a/dune.module b/dune.module index 119b34c..2a56026 100644 --- a/dune.module +++ b/dune.module @@ -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 diff --git a/jenkins/build.sh b/jenkins/build.sh index 5e3ed37..c0a344d 100755 --- a/jenkins/build.sh +++ b/jenkins/build.sh @@ -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 diff --git a/opm-upscaling-prereqs.cmake b/opm-upscaling-prereqs.cmake index f28e8e3..bcc5fb1 100644 --- a/opm-upscaling-prereqs.cmake +++ b/opm-upscaling-prereqs.cmake @@ -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()