Compare commits

...

8 Commits

Author SHA1 Message Date
Arne Morten Kvarving
4b1bf13874 bump versions to 2017.10 final 2017-10-30 11:08:22 +01:00
Atgeirr Flø Rasmussen
2ca8c3d785 Remove RT lib dependency. 2017-10-30 11:07:33 +01:00
Atgeirr Flø Rasmussen
597d08b5de Library not needed nor found on macOS. 2017-10-30 11:07:33 +01:00
Atgeirr Flø Rasmussen
e01c0a77c6 Always set include-related CMake variables. 2017-10-30 11:07:16 +01:00
Andreas Lauser
fa71d4062e don't mark UMFpack as required for opm-simulators
before OPM/opm-simulators#1309 it was required, but this was not
enforced by the build system because the SuiteSparse tests are run by
the opm-core build system first and UMFpack is optional there.

thanks to [at]akva2 and [at]blattms for the heads-up.
2017-10-30 11:07:16 +01:00
Arne Morten Kvarving
f119b3c3fb update redhat packaging 2017-10-30 11:07:16 +01:00
Arne Morten Kvarving
cfd71c5dbb bump debian packaging version to 2017.10-rc1 2017-10-23 14:23:15 +02:00
Andreas Lauser
80e16e6d59 change version to 2017.10-rc1 2017-10-19 19:27:45 +02:00
6 changed files with 13 additions and 13 deletions

View File

@ -18,6 +18,8 @@ macro (opm_compile opm)
if (SILENCE_CROSSMODULE_WARNINGS)
include_directories("${PROJECT_SOURCE_DIR}")
include_directories (SYSTEM ${${opm}_INCLUDE_DIRS})
set (${opm}_INCLUDE_DIR "${PROJECT_SOURCE_DIR}")
set (${opm}_INCLUDE_DIRS ${${opm}_INCLUDE_DIR} ${${opm}_INCLUDE_DIRS})
else()
set (${opm}_INCLUDE_DIR "${PROJECT_SOURCE_DIR}")
set (${opm}_INCLUDE_DIRS ${${opm}_INCLUDE_DIR} ${${opm}_INCLUDE_DIRS})

View File

@ -36,8 +36,6 @@ set (ewoms_DEPS
"opm-parser"
"opm-grid"
"opm-core"
# librt (on some systems necessary for clock_gettime())
"librt REQUIRED"
# valgrind client requests
"Valgrind"
# quadruple precision floating point calculations

View File

@ -26,7 +26,7 @@ set (opm-simulators_DEPS
dune-istl REQUIRED"
"ERTPython"
# Tim Davis' SuiteSparse archive
"SuiteSparse COMPONENTS umfpack REQUIRED"
"SuiteSparse COMPONENTS umfpack"
# OPM dependency
"opm-common REQUIRED;
opm-parser REQUIRED;

2
debian/changelog vendored
View File

@ -1,4 +1,4 @@
opm-common (2015.10-1~trusty) trusty; urgency=medium
opm-common (2017.10-rfinal-1~xenial) xenial; urgency=medium
* New release

View File

@ -5,8 +5,8 @@
Module: opm-common
Description: Open Porous Media Initiative shared infrastructure
Version: 2017.10-pre
Label: 2017.10-pre
Version: 2017.10
Label: 2017.10
Maintainer: opm@opm-project.org
MaintainerName: OPM community
Url: http://opm-project.org

View File

@ -2,19 +2,19 @@
# spec file for package opm-common
#
%define tag rc4
%define tag final
Name: opm-common
Version: 2015.10
Version: 2017.10
Release: 0
Summary: Open Porous Media - common helpers and buildsystem
License: GPL-3.0
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: git doxygen bc
%{?el6:BuildRequires: devtoolset-3-toolchain cmake28 boost148-devel}
%{!?el6:BuildRequires: gcc gcc-c++ cmake boost-devel}
BuildRequires: git doxygen bc devtoolset-6-toolchain
%{?el6:BuildRequires: cmake3 boost148-devel}
%{!?el6:BuildRequires: cmake boost-devel}
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@ -48,8 +48,8 @@ This package contains the documentation files for opm-common
# consider using -DUSE_VERSIONED_DIR=ON if backporting
%build
%{?el6:scl enable devtoolset-3 bash}
%{?el6:cmake28} %{?!el6:cmake} -DBUILD_SHARED_LIBS=1 -DCMAKE_BUILD_TYPE=RelWithDebInfo -DSTRIP_DEBUGGING_SYMBOLS=ON -DCMAKE_INSTALL_PREFIX=%{_prefix} -DCMAKE_INSTALL_DOCDIR=share/doc/%{name}-%{version} -DUSE_RUNPATH=OFF -DWITH_NATIVE=OFF %{?el6:-DCMAKE_CXX_COMPILER=/opt/rh/devtoolset-3/root/usr/bin/g++ -DCMAKE_C_COMPILER=/opt/rh/devtoolset-3/root/usr/bin/gcc -DCMAKE_Fortran_COMPILER=/opt/rh/devtoolset-3/root/usr/bin/gfortran -DBOOST_LIBRARYDIR=%{_libdir}/boost148 -DBOOST_INCLUDEDIR=%{_includedir}/boost148}
scl enable devtoolset-6 bash
%{?el6:cmake28} %{?!el6:cmake} -DBUILD_SHARED_LIBS=1 -DCMAKE_BUILD_TYPE=RelWithDebInfo -DSTRIP_DEBUGGING_SYMBOLS=ON -DCMAKE_INSTALL_PREFIX=%{_prefix} -DCMAKE_INSTALL_DOCDIR=share/doc/%{name}-%{version} -DUSE_RUNPATH=OFF -DWITH_NATIVE=OFF -DCMAKE_CXX_COMPILER=/opt/rh/devtoolset-6/root/usr/bin/g++ -DCMAKE_C_COMPILER=/opt/rh/devtoolset-6/root/usr/bin/gcc -DCMAKE_Fortran_COMPILER=/opt/rh/devtoolset-6/root/usr/bin/gfortran %{?el6:-DBOOST_LIBRARYDIR=%{_libdir}/boost148 -DBOOST_INCLUDEDIR=%{_includedir}/boost148}
make
%install