Merge pull request #2060 from akva2/decouple-libecl-final

remove libecl dependency

CMakeLists.txt

@@ -205,12 +205,9 @@ endif()
 
 # the research oriented general-purpose ECL simulator ("ebos" == &ecl
 # &black-&oil &simulator)
-get_target_property(ecl_INCLUDE_DIRS ecl INTERFACE_INCLUDE_DIRECTORIES)
-
 set(MEBOS_TARGETS "")
 foreach(OBJ blackoil solvent polymer foam gasoil oilwater thermal)
   add_library(ebos_lib${OBJ} OBJECT EXCLUDE_FROM_ALL ebos/ebos_${OBJ}.cc)
-  target_include_directories(ebos_lib${OBJ} PRIVATE ${ecl_INCLUDE_DIRS})
   list(APPEND MEBOS_TARGETS $<TARGET_OBJECTS:ebos_lib${OBJ}>)
 endforeach()
 

debian/control

@@ -5,7 +5,7 @@ Build-Depends: build-essential, debhelper (>= 9), libboost-filesystem-dev,
                libboost-system-dev, libboost-date-time-dev, libboost-test-dev,
                libsuperlu3-dev (>= 3.0) | libsuperlu-dev (>= 4.3), gfortran, libsuitesparse-dev, pkg-config,
                libdune-common-dev, libdune-istl-dev, cmake, libtinyxml-dev, bc,
-               libecl-dev, git, zlib1g-dev, libtool, doxygen,
+               git, zlib1g-dev, libtool, doxygen,
                texlive-latex-extra, texlive-latex-recommended, ghostscript,
                libopm-material-dev,
                libboost-iostreams-dev, libopm-common-dev,

jenkins/build.sh

@@ -4,14 +4,12 @@
 #set -x
 
 declare -a upstreams
-upstreams=(libecl
-           opm-common
+upstreams=(opm-common
            opm-material
            opm-grid
            opm-models)
 
 declare -A upstreamRev
-upstreamRev[libecl]=master
 upstreamRev[opm-common]=master
 upstreamRev[opm-material]=master
 upstreamRev[opm-grid]=master

opm-simulators-prereqs.cmake

@@ -3,7 +3,6 @@ set (opm-simulators_CONFIG_VAR
   HAVE_OPM_GRID
   HAVE_PTHREAD
   HAVE_EWOMS
-  HAVE_ERT
   HAVE_MPI
   HAVE_PETSC
   HAVE_SUITESPARSE_UMFPACK_H

redhat/opm-simulators.spec

@@ -18,7 +18,7 @@ BuildRequires:  git suitesparse-devel doxygen bc devtoolset-6-toolchain
 BuildRequires:  opm-grid-devel opm-grid-openmpi-devel opm-grid-mpich-devel
 BuildRequires:  opm-models-devel opm-models-openmpi-devel opm-models-mpich-devel
 BuildRequires:  opm-material-devel opm-material-openmpi-devel opm-material-mpich-devel
-BuildRequires:  tinyxml-devel dune-istl-devel ecl-devel zlib-devel
+BuildRequires:  tinyxml-devel dune-istl-devel zlib-devel
 BuildRequires:  openmpi-devel trilinos-openmpi-devel ptscotch-openmpi-devel scotch-devel
 BuildRequires:  mpich-devel trilinos-mpich-devel ptscotch-mpich-devel
 BuildRequires:  opm-common-devel opm-common-openmpi-devel opm-common-mpich-devel

tests/update_reference_data.sh

@@ -112,7 +112,7 @@ then
 else
   echo -e "Reason: $REASON\n" >> /tmp/cmsg
 fi
-for dep in libecl opm-common opm-grid opm-material opm-models
+for dep in opm-common opm-grid opm-material opm-models
 do
   pushd $WORKSPACE/deps/$dep > /dev/null
   name=`printf "%-14s" $dep`