OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2025-02-25 18:55:30 -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:04:00 +01:00
parent 13b7a4a426
commit 690ca2cd26
5 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
debian/control vendored
View File

@ -8,8 +8,8 @@ Build-Depends: build-essential, debhelper (>= 9), libboost-filesystem-dev,
libecl-dev, git, zlib1g-dev, libtool, doxygen, libecl-dev, git, zlib1g-dev, libtool, doxygen,
texlive-latex-extra, texlive-latex-recommended, ghostscript, texlive-latex-extra, texlive-latex-recommended, ghostscript,
libopm-material-dev, libeigen3-dev, libopm-material-dev, libeigen3-dev,
libopm-parser-dev, libboost-iostreams-dev, libopm-common-dev, libboost-iostreams-dev, libopm-common-dev,
libopm-grid-dev, libdune-grid-dev, libopm-output-dev, libopm-grid-dev, libdune-grid-dev,
libtrilinos-zoltan-dev, libopenmpi-dev, mpi-default-bin, libewoms-dev libtrilinos-zoltan-dev, libopenmpi-dev, mpi-default-bin, libewoms-dev
Standards-Version: 3.9.2 Standards-Version: 3.9.2
Section: libs Section: libs

2
dune.module
View File

@ -10,4 +10,4 @@ Label: 2018.04-pre
Maintainer: atgeirr@sintef.no Maintainer: atgeirr@sintef.no
MaintainerName: Atgeirr F. Rasmussen MaintainerName: Atgeirr F. Rasmussen
Url: http://opm-project.org 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

10
jenkins/build.sh
View File

@ -4,21 +4,17 @@
#set -x #set -x
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
ewoms) ewoms)
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
upstreamRev[ewoms]=master upstreamRev[ewoms]=master
if grep -q "opm-common=" <<< $ghprbCommentBody if grep -q "opm-common=" <<< $ghprbCommentBody

6
opm-simulators-prereqs.cmake
View File

@ -39,13 +39,15 @@ set (opm-simulators_DEPS
"SuperLU" "SuperLU"
# OPM dependency # OPM dependency
"opm-common REQUIRED" "opm-common REQUIRED"
"opm-parser REQUIRED"
"opm-material REQUIRED" "opm-material REQUIRED"
"opm-grid REQUIRED" "opm-grid REQUIRED"
"opm-output REQUIRED"
"ewoms REQUIRED" "ewoms REQUIRED"
# Eigen # Eigen
"Eigen3 3.2.0" "Eigen3 3.2.0"
) )
find_package_deps(opm-simulators) 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()

6
redhat/opm-simulators.spec
View File

@ -1,5 +1,5 @@
# #
# spec file for package opm-autodiff # spec file for package opm-simulators
# #
%define tag rc1 %define tag rc1
@ -12,9 +12,9 @@ License: GPL-3.0
Group: Development/Libraries/C and C++ Group: Development/Libraries/C and C++
Url: http://www.opm-project.org/ Url: http://www.opm-project.org/
Source0: https://github.com/OPM/%{name}/archive/release/%{version}/%{tag}.tar.gz#/%{name}-%{version}.tar.gz 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: 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 BuildRequires: tinyxml-devel dune-istl-devel eigen3-devel ecl-devel ewoms-devel
%{?el6:BuildRequires: cmake3 boost148-devel} %{?el6:BuildRequires: cmake3 boost148-devel}
%{!?el6:BuildRequires: cmake boost-devel} %{!?el6:BuildRequires: cmake boost-devel}