Commit Graph

772 Commits

Author SHA1 Message Date
Andreas Lauser
f3be13c5af travis: switch from dune 2.3.1 to dune 2.4.1
It seems like OPM support for Dune 2.3 is going to be removed sooner
rather than later. Also, all relevant distributions which I'm aware of
seem to ship at least Dune-2.4 packages.

note that this patch switches to Dune 2.4.1 instead of the latest Dune
2.4 release (i.e., 2.4.2) because travis seems to block downloads from
sites it does not know -- in this case dune-project.org -- and the
Dune github mirrors seem to have been abandoned a few months ago and
thus do not feature dune 2.4.2.
2017-07-18 18:22:51 +02:00
Rohith Nair
579a648ebc edit 2017-06-27 10:32:05 +02:00
Rohith Nair
08b659fe11 Revert to formatting prefix message 2017-06-27 10:27:32 +02:00
Rohith Nair
531fb27ba1 edit 2017-06-26 11:54:53 +02:00
Rohith Nair
0024fd9052 Add line space before problems, messages and warnings 2017-06-26 10:57:38 +02:00
Markus Blatt
f8841cea15 Search for same header as used in compile test of Findopm-grid.cmake 2017-06-21 13:23:05 +00:00
Markus Blatt
3dd214ba34 Include geometry version in config.h.
This is needed with DUNE 2.5 as otherwise the includes of
geometry headers are for older DUNE versions.
2017-06-21 13:15:12 +00:00
Markus Blatt
ef5f730786 Make check for opm-grid work with DUNE 2.5.
Previously, we checked for header CpGrid.hpp which finally
tried to include the non-existent generic geometry headers
as the checks for dune-geometry versions do not work during
 a CMake run.
With this patch we search for the header GlobalIdMapper.hpp which
does not use any version checks and therefore works for every DUNE
version.
2017-06-21 13:15:12 +00:00
Arne Morten Kvarving
65b4a7cc96 Merge pull request #258 from jokva/find-opm-parser-require-boost
Add find_package(Boost) in Findopm-parser
2017-06-16 10:15:47 +02:00
Jørgen Kvalsvik
62c2b15c29 Don't exit early when checking dynamic boost 2017-06-15 14:39:27 +02:00
Jørgen Kvalsvik
5df5c59c27 Add find_package(Boost) in Findopm-parser 2017-06-15 10:04:35 +02:00
Arne Morten Kvarving
98728e91f7 Merge pull request #257 from blattms/use-hints-precedenting-cache
Pass sibling dirs HINTS to find_package calls for opm-parser.
2017-06-13 11:47:47 +02:00
Markus Blatt
5c731bf2ce Stop marking non-stored variables as advanced. 2017-06-13 11:09:11 +02:00
Markus Blatt
bea6eb9240 Removed dead code. 2017-06-13 10:21:54 +02:00
Markus Blatt
5500dcfe8b Pass sibling dirs HINTS to find_package calls for opm-parser.
These take precendence over the package registry where we have no control
on which entry will be used. The registry is only the last resort.

On some Linux version the most recently created package registry key will
be used. Please not that an entry is only created for a build try that is
not already in the registry. If there is already key, then not even the
modification date of the key will be updated. This default behaviour might
lead to strange mixes of build configurations.
2017-06-12 21:13:58 +02:00
Joakim Hove
8502fdd324 Merge pull request #254 from joakim-hove/update-travis-build
Update travis build
2017-06-10 12:59:34 +02:00
Joakim Hove
073e0c809c Set env variable TRAVIS_CI when running travis. 2017-06-10 11:17:03 +02:00
Joakim Hove
9e88a3d4e7 CHanged travis build order. 2017-06-10 11:16:01 +02:00
Atgeirr Flø Rasmussen
d997b26bf9 Merge pull request #252 from akva2/sca_fixes
Fixes for warnings from static code analysis
2017-06-09 12:15:49 +02:00
Arne Morten Kvarving
b9dde75a4d remove extra class qualification
may cause portability issues
2017-06-08 16:33:25 +02:00
Arne Morten Kvarving
19ca0e291b initialize members 2017-06-08 16:30:53 +02:00
Arne Morten Kvarving
2c00b418b5 pass by reference 2017-06-08 16:30:46 +02:00
Arne Morten Kvarving
b7302a5ace mark single-parameter constructors as explicit 2017-06-08 16:30:09 +02:00
Atgeirr Flø Rasmussen
89b84ccde4 Merge pull request #243 from nairr/term_output_mod
Add exception TooManyIterations
2017-06-07 15:04:34 +02:00
Rohith Nair
d361bd8766 Adds exception TooManyIterations
Adds 2 new message types to OpmLog

Revert "Adds 2 new message types to OpmLog"

This reverts commit 587cde3c6c78077cd6e5ae008038f72b2b39982d.
2017-06-07 09:58:20 +02:00
Atgeirr Flø Rasmussen
9602be7ca0 Merge pull request #251 from akva2/quell_sca_error
remove namespace qualifier
2017-06-06 08:28:56 +02:00
Arne Morten Kvarving
f147dd9589 remove namespace qualifier
code is already in the namespace, some compilers consider this an error.
2017-06-02 16:02:24 +02:00
Arne Morten Kvarving
eaf09f34c3 Merge pull request #250 from akva2/add_sca
Add static code analysis support
2017-06-02 14:53:19 +02:00
Arne Morten Kvarving
ed50891e5f add ability to execute a specific ctest configuration in jenkins scripts 2017-06-02 10:38:54 +02:00
Arne Morten Kvarving
cdbcb74e5e add static analysis support to buildsystem 2017-06-02 10:38:54 +02:00
jokva
6d2194edc2 Merge pull request #248 from jokva/refactor-parser-cmake
Refactor parser cmake
2017-06-01 15:29:52 +02:00
Jørgen Kvalsvik
fbec9b1e0d Findopm-parser tries CONFIG mode first
CONFIG mode is usually a fallback when Find* modules are not found, but
opm-parser is now mainly meant to be used with config mode, so it's the
first thing being tried. If that fails, continue with the old logic.

Some legacy requires HAVE_ERT being set somewhere, so this logic is
injected here.
2017-05-31 21:51:35 +02:00
Jørgen Kvalsvik
2b342ce3f0 ERT -> ecl 2017-05-31 14:54:19 +02:00
Jørgen Kvalsvik
2aedb2407f Upgrade cmake on travis 2017-05-26 13:43:23 +02:00
Arne Morten Kvarving
fa3a6a1b13 Merge pull request #247 from blattms/allow-external-static-libs-for-shared-opm-libs
Allow using external static libraries with BUILD_SHARED_LIBS=ON
2017-05-19 13:24:54 +02:00
Markus Blatt
cd4c0f54fb Allow using external static libraries with BUILD_SHARED_LIBS=ON
Previously, this failed if one dependency was a static library compiled
without -fPIC. This is is the case for library libsuitesparseconfig on
Debian which has no dynamic alternative. The error messages read e.g.

```
/usr/bin/ld: /usr/lib/gcc/x86_64-linux-gnu/4.9/../../../x86_64-linux-gnu/libsuitesparseconfig.a(SuiteSparse_config.o): relocation R_X86_64_PC32 against undefined symbol `malloc@@GLIBC_2.2.5' can not be used when making a shared object; recompile with -fPIC
/usr/bin/ld: final link failed: Bad value
```

With this patch we change the target_link_libraries call when using
BUILD_SHARED_LIBS=ON. We only pass the dynamic libraries as PUBLIC such
that they will get linked to the library. The static ones are passed as
INTERFACE libraries. This means that they will be automatically linked
to executables which link to the main library. Currently this transitive
linking will only work in the same module as we do not correctly export
libraries. But our build system explicitly links the others ones anyway.
2017-05-18 20:37:31 +02:00
Arne Morten Kvarving
a7402e5720 Merge pull request #245 from alfbr/master
Change release build optimization from -O2 to -O3
2017-05-16 14:37:10 +02:00
Alf B. Rustad
6332d56c2c Change release build optimization from -O2 to -O3 2017-05-16 11:17:19 +02:00
Arne Morten Kvarving
e6c4d4f0d0 Merge pull request #244 from akva2/leftover_ert
add a missed ert -> libecl
2017-05-12 16:01:16 +02:00
Arne Morten Kvarving
530791ede3 add a missed ert -> libecl 2017-05-12 12:06:59 +02:00
Joakim Hove
f8ef8dbe07 Merge pull request #237 from joakim-hove/jenkins-use-libecl
Changed jenkins build script to use libecl.
2017-05-10 13:36:18 +02:00
Joakim Hove
cb46a93dca Changed to use libecl when building on jenkins. 2017-05-07 12:50:10 +02:00
Atgeirr Flø Rasmussen
ec96d6e9c9 Merge pull request #242 from akva2/adjust_opm_core_test
fix opm-core test
2017-05-02 07:19:33 +02:00
Arne Morten Kvarving
e86d9b8b73 fix opm-core test
namespace has been removed
2017-04-28 15:32:18 +02:00
Atgeirr Flø Rasmussen
0a7a9f65a3 Merge pull request #241 from akva2/remove_tinyxml
remove tinyxml from opm-core requirements
2017-04-28 14:07:30 +02:00
Arne Morten Kvarving
7d7dd7e582 remove tinyxml from opm-core requirements 2017-04-28 11:19:43 +02:00
Atgeirr Flø Rasmussen
cf06e2c00b Merge pull request #236 from joakim-hove/travis-use-libecl
The travis build will use Statoil/libecl
2017-04-28 10:15:24 +02:00
Andreas Lauser
8aa6894a88 Merge pull request #240 from akva2/no_native_in_packaging
disable native tuning in packaging
2017-04-26 14:49:01 +02:00
Arne Morten Kvarving
1be92935b0 disable native tuning in packaging 2017-04-26 14:45:09 +02:00
Joakim Hove
d1a3e4a872 Change ert -> libecl
- The travis build will use Statoi/libecl
 - The FindERT cmake module has been updated to look for both ert/ and
   libecl/
2017-04-18 20:32:02 +02:00