diff --git a/debian/control b/debian/control index 6963a855b..6e06929b1 100644 --- a/debian/control +++ b/debian/control @@ -8,8 +8,8 @@ Build-Depends: build-essential, debhelper (>= 9), libboost-filesystem-dev, libecl-dev, git, zlib1g-dev, libtool, doxygen, texlive-latex-extra, texlive-latex-recommended, ghostscript, libopm-material-dev, libeigen3-dev, - libopm-parser-dev, libboost-iostreams-dev, libopm-common-dev, - libopm-grid-dev, libdune-grid-dev, libopm-output-dev, + libboost-iostreams-dev, libopm-common-dev, + libopm-grid-dev, libdune-grid-dev, libtrilinos-zoltan-dev, libopenmpi-dev, mpi-default-bin, libewoms-dev Standards-Version: 3.9.2 Section: libs diff --git a/dune.module b/dune.module index 512e68a0c..e0fb43221 100644 --- a/dune.module +++ b/dune.module @@ -10,4 +10,4 @@ Label: 2018.04-pre Maintainer: atgeirr@sintef.no MaintainerName: Atgeirr F. Rasmussen Url: http://opm-project.org -Depends: dune-istl (>= 2.4) opm-common opm-parser opm-output opm-material opm-grid ewoms +Depends: dune-istl (>= 2.4) opm-common opm-material opm-grid ewoms diff --git a/jenkins/build.sh b/jenkins/build.sh index 6c9133497..71307e77e 100755 --- a/jenkins/build.sh +++ b/jenkins/build.sh @@ -4,21 +4,17 @@ #set -x declare -a upstreams -upstreams=(opm-common - libecl - opm-parser - opm-output +upstreams=(libecl + opm-common opm-material opm-grid ewoms) 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 upstreamRev[ewoms]=master if grep -q "opm-common=" <<< $ghprbCommentBody diff --git a/opm-simulators-prereqs.cmake b/opm-simulators-prereqs.cmake index 834372295..c592be185 100644 --- a/opm-simulators-prereqs.cmake +++ b/opm-simulators-prereqs.cmake @@ -39,13 +39,15 @@ set (opm-simulators_DEPS "SuperLU" # OPM dependency "opm-common REQUIRED" - "opm-parser REQUIRED" "opm-material REQUIRED" "opm-grid REQUIRED" - "opm-output REQUIRED" "ewoms REQUIRED" # Eigen "Eigen3 3.2.0" ) find_package_deps(opm-simulators) + +if(NOT HAVE_ECL_INPUT OR NOT HAVE_ECL_OUTPUT) + message(FATAL_ERROR "Eclipse input/output support required in opm-common") +endif() diff --git a/redhat/opm-simulators.spec b/redhat/opm-simulators.spec index 74248eba1..c4202d23d 100644 --- a/redhat/opm-simulators.spec +++ b/redhat/opm-simulators.spec @@ -1,5 +1,5 @@ # -# spec file for package opm-autodiff +# spec file for package opm-simulators # %define tag rc1 @@ -12,9 +12,9 @@ License: GPL-3.0 Group: Development/Libraries/C and C++ Url: http://www.opm-project.org/ Source0: https://github.com/OPM/%{name}/archive/release/%{version}/%{tag}.tar.gz#/%{name}-%{version}.tar.gz -BuildRequires: blas-devel lapack-devel dune-common-devel opm-output-devel +BuildRequires: blas-devel lapack-devel dune-common-devel BuildRequires: git suitesparse-devel doxygen bc devtoolset-6-toolchain -BuildRequires: opm-parser-devel opm-grid-devel +BuildRequires: opm-grid-devel BuildRequires: tinyxml-devel dune-istl-devel eigen3-devel ecl-devel ewoms-devel %{?el6:BuildRequires: cmake3 boost148-devel} %{!?el6:BuildRequires: cmake boost-devel}