Skip to content

Commit

Permalink
Merge pull request #397 from akva2/decouple-libecl-final
Browse files Browse the repository at this point in the history
remove libecl dependency
  • Loading branch information
bska authored Oct 17, 2019
2 parents da63820 + bb9f805 commit 97d2910
Show file tree
Hide file tree
Showing 4 changed files with 3 additions and 6 deletions.
2 changes: 1 addition & 1 deletion debian/control
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ Build-Depends: build-essential, debhelper (>= 9), libboost-filesystem-dev,
libdune-common-dev, cmake, bc, git, zlib1g-dev, libtool, pkg-config,
libdune-grid-dev, libtinyxml-dev,
libdune-istl-dev, doxygen, texlive-latex-extra,
texlive-latex-recommended, ghostscript, libecl-dev,
texlive-latex-recommended, ghostscript,
libboost-iostreams-dev, libsuitesparse-dev,
libopm-common-dev,
libdune-geometry-dev, libtrilinos-zoltan-dev, libopenmpi-dev,
Expand Down
4 changes: 1 addition & 3 deletions jenkins/build.sh
Original file line number Diff line number Diff line change
@@ -1,12 +1,10 @@
#!/bin/bash

declare -a upstreams
upstreams=(libecl
opm-common)
upstreams=(opm-common)

declare -A upstreamRev
upstreamRev[opm-common]=master
upstreamRev[libecl]=master

if grep -q "opm-common=" <<< $ghprbCommentBody
then
Expand Down
1 change: 0 additions & 1 deletion opm-grid-prereqs.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ set (opm-grid_DEPS
"dune-istl"
"opm-common REQUIRED"
"ZOLTAN"
"ecl REQUIRED"
)

find_package_deps(opm-grid)
2 changes: 1 addition & 1 deletion redhat/opm-grid.spec
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ 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 devtoolset-6-toolchain
BuildRequires: git suitesparse-devel doxygen bc ecl-devel opm-common-devel
BuildRequires: git suitesparse-devel doxygen bc opm-common-devel
BuildRequires: tinyxml-devel dune-istl-devel dune-geometry-devel dune-grid-devel
BuildRequires: openmpi-devel trilinos-openmpi-devel ptscotch-openmpi-devel scotch-devel
BuildRequires: mpich-devel trilinos-mpich-devel ptscotch-mpich-devel zlib-devel
Expand Down

0 comments on commit 97d2910

Please sign in to comment.