From bb9f80561885b854974cba46c0b75b1b6c8ced36 Mon Sep 17 00:00:00 2001 From: Arne Morten Kvarving Date: Tue, 15 Oct 2019 14:24:33 +0200 Subject: [PATCH] remove libecl dependency --- debian/control | 2 +- jenkins/build.sh | 4 +--- opm-grid-prereqs.cmake | 1 - redhat/opm-grid.spec | 2 +- 4 files changed, 3 insertions(+), 6 deletions(-) diff --git a/debian/control b/debian/control index acba11b2c..3fb92d9c5 100644 --- a/debian/control +++ b/debian/control @@ -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, diff --git a/jenkins/build.sh b/jenkins/build.sh index d6a250f05..503b53e03 100755 --- a/jenkins/build.sh +++ b/jenkins/build.sh @@ -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 diff --git a/opm-grid-prereqs.cmake b/opm-grid-prereqs.cmake index 2ad0d86d9..f46198892 100644 --- a/opm-grid-prereqs.cmake +++ b/opm-grid-prereqs.cmake @@ -31,7 +31,6 @@ set (opm-grid_DEPS "dune-istl" "opm-common REQUIRED" "ZOLTAN" - "ecl REQUIRED" ) find_package_deps(opm-grid) diff --git a/redhat/opm-grid.spec b/redhat/opm-grid.spec index 8dbc0e31b..e37fa39f2 100644 --- a/redhat/opm-grid.spec +++ b/redhat/opm-grid.spec @@ -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