OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2024-07-07 04:53:03 -05:00
Code Issues Packages Projects Releases Wiki Activity

remove opm-core from upstream and prerequisite lists

Browse Source 
debian/redhat packaging updated as well
This commit is contained in:
Arne Morten Kvarving 2018-01-17 11:54:07 +01:00
parent e674fd2b16
commit c30e3088b5
5 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
debian/control vendored
View File

@ -7,7 +7,7 @@ Build-Depends: build-essential, debhelper (>= 9), libboost-filesystem-dev,
libdune-common-dev, libdune-istl-dev, cmake, libtinyxml-dev, bc,
libecl-dev, git, zlib1g-dev, libtool, doxygen,
texlive-latex-extra, texlive-latex-recommended, ghostscript,
libopm-core-dev, libopm-material-dev, libeigen3-dev,
libopm-material-dev, libeigen3-dev,
libopm-parser-dev, libboost-iostreams-dev, libopm-common-dev,
libopm-grid-dev, libdune-grid-dev, libopm-output-dev,
libtrilinos-zoltan-dev, libopenmpi-dev, mpi-default-bin, libewoms-dev

2
dune.module
View File

@ -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-core opm-grid ewoms
Depends: dune-istl (>= 2.4) opm-common opm-parser opm-output opm-material opm-grid ewoms

2
jenkins/build.sh
View File

@ -10,7 +10,6 @@ upstreams=(opm-common
opm-output
opm-material
opm-grid
opm-core
ewoms)
declare -A upstreamRev
@ -18,7 +17,6 @@ upstreamRev[opm-common]=master
upstreamRev[libecl]=master
upstreamRev[opm-parser]=master
upstreamRev[opm-material]=master
upstreamRev[opm-core]=master
upstreamRev[opm-grid]=master
upstreamRev[opm-output]=master
upstreamRev[ewoms]=master

1
opm-simulators-prereqs.cmake
View File

@ -27,7 +27,6 @@ set (opm-simulators_DEPS
"opm-common REQUIRED"
"opm-parser REQUIRED"
"opm-grid REQUIRED"
"opm-core REQUIRED"
"opm-output REQUIRED"
"ewoms REQUIRED"
# Eigen

2
redhat/opm-simulators.spec
View File

@ -14,7 +14,7 @@ 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: git suitesparse-devel doxygen bc devtoolset-6-toolchain
BuildRequires: opm-parser-devel opm-core-devel opm-grid-devel
BuildRequires: opm-parser-devel 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}