OilfieldToolsNet/opm-upscaling
4
0
Fork 0
mirror of https://github.com/OPM/opm-upscaling.git synced 2025-02-25 18:45:23 -06:00
Code Issues Packages Projects Releases Wiki Activity

adjustments for eclipse support in opm-common

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dune.module
View File

@ -10,4 +10,4 @@ Label: 2018.04-pre
Maintainer: arne.morten.kvarving@sintef.no Maintainer: arne.morten.kvarving@sintef.no
MaintainerName: Arne Morten Kvarving MaintainerName: Arne Morten Kvarving
Url: http://opm-project.org 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

10
jenkins/build.sh
View File

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

5
opm-upscaling-prereqs.cmake
View File

@ -24,7 +24,10 @@ set (opm-upscaling_DEPS
"dune-grid REQUIRED" "dune-grid REQUIRED"
"opm-common REQUIRED" "opm-common REQUIRED"
"opm-grid REQUIRED" "opm-grid REQUIRED"
"opm-output REQUIRED"
) )
find_package_deps(opm-upscaling) 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()