Commit Graph

332 Commits

Author SHA1 Message Date
Alf Birger Rustad
0183fa884a Make compiling with OpenMP default. 2018-08-17 13:39:44 +02:00
Arne Morten Kvarving
0627a9f8ef added: strip test_ prefix from tests added with opm_add_test 2018-08-03 09:58:59 +02:00
Markus Blatt
4a5333887b Research for software if we search for COMPONENTS.
Otherwise we will never search for e.g. Boost multiple
times and the upmost module in the hierarchy will dictate
the components to be used. That does not work for downstream
modules.

Therefore with this change we check whether there is an argument
COMPONENTS passed to find_package and make sure there will be
another call to it if that is the case.
2018-07-13 16:10:32 +02:00
Markus Blatt
563c053d3a Set only ecl_LIBRARIES and nothing else for ecl. 2018-07-12 12:25:21 +02:00
Markus Blatt
cbd44ff67a Remove unneeded opm_common_processed variable.
As we now process the prerequisites in the package configuration file
one search for opm-common is fully sufficient.
2018-07-12 12:25:21 +02:00
Markus Blatt
32dabd6572 Handle prerequisites at the end of package configuration file.
The code in @opm-project_NAME@-prereqs uses macros from OpmPackage.cmake. At
the previous location that file was not yet included for the module opm-common
as this is done in the section @OPM_PROJECT_EXTRA_CODE@, which also sets
CMAKE_MODULE_PATH.
2018-07-12 12:24:43 +02:00
Markus Blatt
3fabf2aad3 Unify handling of package dependency.
There was one macro to do that and one inline code in another
macro. With these changes we always use the macro for this.
2018-07-12 10:45:08 +02:00
Markus Blatt
90cbad1163 Better mark extra code section in opm-project-config.cmake.in 2018-07-06 11:02:50 +02:00
Robert Kloefkorn
13d1ce4fbf [bugfix][Finddune-istl] Add HAVE_SUITESPARSE_UMFPACK for newer dune-istl
versions.
2018-07-02 15:56:03 +02:00
Roland Kaufmann
2356cc35e5 Improve status message when libtool is not present
Libtool uses libtool archive files (.la) to determine how to do a
platform-specific link. To generate these files, it is necessary to have
libtool installed on the system, since it will only accept files with
its own particular version number embedded. If libtool is not installed,
you probably don't need the libtool archive files either, so no .la is
generated. However, the status message sounded like libtool was probed
but not found, and that this was something that you should install.

This patch modifies the status message to make it more clear way libtool
was probed, and what the consequence of a missing libtool is (i.e. no
.la file for you).
2018-06-26 09:22:03 +02:00
Markus Blatt
c6536c0b2f Allow DUNE modules to locate the dune.module files during CMake run.
For this we need to set <dune-module>_PREFIX either to where the module
is installed to or the source directory for a build with uninstalled
modules.
2018-06-18 12:47:53 +02:00
Arne Morten Kvarving
e823b0a93e changed: replace opm-data with new opm-tests repository 2018-03-27 12:09:09 +02:00
Arne Morten Kvarving
726ccd7fd7 Import opm-parser 2018-03-05 10:30:29 +01:00
Markus Blatt
0e25c9f2e9 Always add ecl target to ecl_LIBRARIES.
Otherwise the flow binary does not know the correct
path to libecl in some situations.
2018-03-02 22:15:54 +01:00
Arne Morten Kvarving
cedb010a04 fixed: set the boost dynamic test define if boost::unit_test_framework
is a shared library

additional condition for opm-parser as it forces dyn boost test (not
strictly necessary but it highlights the different behaviour for now)
2018-02-15 07:21:35 +01:00
Arne Morten Kvarving
94f71b730d fixed: prefix created dir with PROJECT_BINARY_DIR to facilitate superbuild 2018-02-13 15:05:49 +01:00
Arne Morten Kvarving
c486e6ebd8 re-add fancy names 2018-02-13 14:10:18 +01:00
Arne Morten Kvarving
535d7df784 changed: add targets for tests even if BUILD_TESTING is off
we still want to be able to build them, just not by default.
ref 'make check' and 'make test-suite'.
2018-02-13 14:10:18 +01:00
Arne Morten Kvarving
c151e09aec changed: filter out some include paths which leads us down a path to bogus 2018-02-13 14:10:18 +01:00
Arne Morten Kvarving
e681b47de2 added: use exported targets 2018-02-13 14:10:18 +01:00
Arne Morten Kvarving
f7c288a3f4 changed: switch to the shared opm build system 2018-02-12 13:36:49 +01:00
Arne Morten Kvarving
3a447d8532 fixed: remove erroneous brace 2018-02-05 11:36:01 +01:00
Arne Morten Kvarving
b4e439fc19 fixed: really handle the _prepare target for tests 2018-01-30 11:51:18 +01:00
Arne Morten Kvarving
d76a15539e Merge pull request #319 from blattms/slu_dune2.6_full
added: support building with superlu for dune 2.6 (complete version)
2018-01-30 10:38:38 +01:00
Atgeirr Flø Rasmussen
b46348f074 Merge pull request #321 from akva2/super_build
Some changes to facilitate building using a super project
2018-01-29 16:28:09 +01:00
Atgeirr Flø Rasmussen
c7b5799071 Merge pull request #320 from blattms/support-dune-uggrid
Support dune-uggrid (successor of UG).
2018-01-26 12:24:07 +01:00
Arne Morten Kvarving
bd316fa27f changed: do not require a "fancy name" for tests
earlier the assumption has been that all test executables have a test_ prefix
which was stripped off. now we just use the full name if the prefix is not
found.
2018-01-24 12:32:45 +01:00
Markus Blatt
3dff53ec16 [squash] fix typo in comment 2018-01-22 15:45:50 +01:00
Arne Morten Kvarving
5e0157f407 added: support building with superlu for dune 2.6 2018-01-22 15:29:44 +01:00
Arne Morten Kvarving
d0fa9ce9dc changed: remove hack for dunecontrol+autotools compatibility
all supported dune versions have cmake builds which should be used
2018-01-22 11:06:36 +01:00
Arne Morten Kvarving
a3a0f90811 check for the existence of a opmmodule_prepare target
if it exists, add this as a dependecy for satellites
2018-01-19 16:33:13 +01:00
Arne Morten Kvarving
2b8ee5a82d changed: check for existing target before importing
to aid use of a super project for opm
2018-01-19 14:35:58 +01:00
Arne Morten Kvarving
4e9f15dec3 changed: use ${project}. to aid use of a super-project for opm 2018-01-19 14:35:58 +01:00
Markus Blatt
3681fe0800 Support dune-uggrid (successor of UG). 2018-01-18 22:39:40 +01:00
Arne Morten Kvarving
4340691ff8 added: handle QuadMath support like MPI 2018-01-17 15:57:48 +01:00
Arne Morten Kvarving
de7f4e168d fixed: we need to do mpi disabling earlier
if not, prereqs do not see this file, and the option ends
up not being operational for prereqs looking for MPI.
2018-01-17 15:57:16 +01:00
Arne Morten Kvarving
8fc5283b05 Merge pull request #306 from blattms/fix-pr-304
Include <module>-prereqs.cmake in <module>-config.cmake to process all dependencies
2017-12-21 14:00:32 +01:00
Markus Blatt
4c0625aa8b Include <module>-prereqs.cmake in <module>-config.cmake for transitive search
Otherwise implicit dependencies are never search for. That was the case
for dune-geometry and dune-grid when configuring opm-core as these are only
transitively required via opm-grid.

With this commit we include <module>-prereqs.cmake in <module>-config.cmake
and thus trigger searches for all modules that this module depends on.

We also install the file now <module>-prereqs.cmake as we need it for
installed modules, too.
2017-12-21 12:52:33 +00:00
Arne Morten Kvarving
3a60e567bb fixed: this test code slipped through in 9737538708
sorry about that
2017-12-21 13:05:00 +01:00
Arne Morten Kvarving
9737538708 changed: get rid of find modules for opm modules
use pure config mode.

we no longer compile a test application for the libraries,
however checks have been tightened by making sure version of
all opm modules are the same.

this allows for putting prereqs directly in the module repositories
2017-12-20 11:12:01 +01:00
Atgeirr Flø Rasmussen
a346cf5e16 Merge pull request #285 from akva2/add_ndebug_option
added: option to not define NDEBUG for release builds
2017-11-28 07:30:42 +01:00
Atgeirr Flø Rasmussen
2204a160cf Merge pull request #291 from akva2/fix_core_test_program
fixed: do not use ParameterGroup code in opm-core test program
2017-11-27 13:21:38 +01:00
Arne Morten Kvarving
af503d2c48 fixed: do not use ParameterGroup code in opm-core test program
it now sits in opm-common. yields confusing output as test
program compilation will succeed even if opm-common but not opm-core
is available
2017-11-24 12:44:03 +01:00
Andreas Lauser
2c6db2a109 remove the configure wrapper script
this used to provide autotools compatibility, but it has not been working for a while. Thus it is IMO better to remove it in order not to mislead people.
2017-11-24 10:37:40 +01:00
Arne Morten Kvarving
439aae72d2 added: option to not define NDEBUG for release builds 2017-11-13 12:16:23 +01:00
Markus Blatt
4a46e4a4cd Only set the library directories if module builds a library. 2017-11-08 14:58:38 +01:00
Arne Morten Kvarving
d0c1eb28e3 Merge pull request #281 from andlaus/opm-simulators_no_umfpack_required
don't mark UMFpack as required for opm-simulators
2017-10-30 11:05:32 +01:00
Atgeirr Flø Rasmussen
1709398e25 Remove RT lib dependency. 2017-10-27 10:09:25 +02:00
Atgeirr Flø Rasmussen
de70cdcb52 Library not needed nor found on macOS. 2017-10-26 11:08:10 +02:00
Atgeirr Flø Rasmussen
5519643aa4 Always set include-related CMake variables. 2017-10-26 10:51:18 +02:00