Compare commits
8 Commits
release/20
...
release/20
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
4b1bf13874 | ||
|
|
2ca8c3d785 | ||
|
|
597d08b5de | ||
|
|
e01c0a77c6 | ||
|
|
fa71d4062e | ||
|
|
f119b3c3fb | ||
|
|
cfd71c5dbb | ||
|
|
80e16e6d59 |
@@ -18,6 +18,8 @@ macro (opm_compile opm)
|
|||||||
if (SILENCE_CROSSMODULE_WARNINGS)
|
if (SILENCE_CROSSMODULE_WARNINGS)
|
||||||
include_directories("${PROJECT_SOURCE_DIR}")
|
include_directories("${PROJECT_SOURCE_DIR}")
|
||||||
include_directories (SYSTEM ${${opm}_INCLUDE_DIRS})
|
include_directories (SYSTEM ${${opm}_INCLUDE_DIRS})
|
||||||
|
set (${opm}_INCLUDE_DIR "${PROJECT_SOURCE_DIR}")
|
||||||
|
set (${opm}_INCLUDE_DIRS ${${opm}_INCLUDE_DIR} ${${opm}_INCLUDE_DIRS})
|
||||||
else()
|
else()
|
||||||
set (${opm}_INCLUDE_DIR "${PROJECT_SOURCE_DIR}")
|
set (${opm}_INCLUDE_DIR "${PROJECT_SOURCE_DIR}")
|
||||||
set (${opm}_INCLUDE_DIRS ${${opm}_INCLUDE_DIR} ${${opm}_INCLUDE_DIRS})
|
set (${opm}_INCLUDE_DIRS ${${opm}_INCLUDE_DIR} ${${opm}_INCLUDE_DIRS})
|
||||||
|
|||||||
@@ -36,8 +36,6 @@ set (ewoms_DEPS
|
|||||||
"opm-parser"
|
"opm-parser"
|
||||||
"opm-grid"
|
"opm-grid"
|
||||||
"opm-core"
|
"opm-core"
|
||||||
# librt (on some systems necessary for clock_gettime())
|
|
||||||
"librt REQUIRED"
|
|
||||||
# valgrind client requests
|
# valgrind client requests
|
||||||
"Valgrind"
|
"Valgrind"
|
||||||
# quadruple precision floating point calculations
|
# quadruple precision floating point calculations
|
||||||
|
|||||||
@@ -26,7 +26,7 @@ set (opm-simulators_DEPS
|
|||||||
dune-istl REQUIRED"
|
dune-istl REQUIRED"
|
||||||
"ERTPython"
|
"ERTPython"
|
||||||
# Tim Davis' SuiteSparse archive
|
# Tim Davis' SuiteSparse archive
|
||||||
"SuiteSparse COMPONENTS umfpack REQUIRED"
|
"SuiteSparse COMPONENTS umfpack"
|
||||||
# OPM dependency
|
# OPM dependency
|
||||||
"opm-common REQUIRED;
|
"opm-common REQUIRED;
|
||||||
opm-parser REQUIRED;
|
opm-parser REQUIRED;
|
||||||
|
|||||||
2
debian/changelog
vendored
2
debian/changelog
vendored
@@ -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
|
* New release
|
||||||
|
|
||||||
|
|||||||
@@ -5,8 +5,8 @@
|
|||||||
|
|
||||||
Module: opm-common
|
Module: opm-common
|
||||||
Description: Open Porous Media Initiative shared infrastructure
|
Description: Open Porous Media Initiative shared infrastructure
|
||||||
Version: 2017.10-pre
|
Version: 2017.10
|
||||||
Label: 2017.10-pre
|
Label: 2017.10
|
||||||
Maintainer: opm@opm-project.org
|
Maintainer: opm@opm-project.org
|
||||||
MaintainerName: OPM community
|
MaintainerName: OPM community
|
||||||
Url: http://opm-project.org
|
Url: http://opm-project.org
|
||||||
|
|||||||
@@ -2,19 +2,19 @@
|
|||||||
# spec file for package opm-common
|
# spec file for package opm-common
|
||||||
#
|
#
|
||||||
|
|
||||||
%define tag rc4
|
%define tag final
|
||||||
|
|
||||||
Name: opm-common
|
Name: opm-common
|
||||||
Version: 2015.10
|
Version: 2017.10
|
||||||
Release: 0
|
Release: 0
|
||||||
Summary: Open Porous Media - common helpers and buildsystem
|
Summary: Open Porous Media - common helpers and buildsystem
|
||||||
License: GPL-3.0
|
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: git doxygen bc
|
BuildRequires: git doxygen bc devtoolset-6-toolchain
|
||||||
%{?el6:BuildRequires: devtoolset-3-toolchain cmake28 boost148-devel}
|
%{?el6:BuildRequires: cmake3 boost148-devel}
|
||||||
%{!?el6:BuildRequires: gcc gcc-c++ cmake boost-devel}
|
%{!?el6:BuildRequires: cmake boost-devel}
|
||||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||||
|
|
||||||
%description
|
%description
|
||||||
@@ -48,8 +48,8 @@ This package contains the documentation files for opm-common
|
|||||||
|
|
||||||
# consider using -DUSE_VERSIONED_DIR=ON if backporting
|
# consider using -DUSE_VERSIONED_DIR=ON if backporting
|
||||||
%build
|
%build
|
||||||
%{?el6:scl enable devtoolset-3 bash}
|
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 %{?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}
|
%{?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
|
make
|
||||||
|
|
||||||
%install
|
%install
|
||||||
|
|||||||
Reference in New Issue
Block a user