Commit Graph
365 Commits
Author SHA1 Message Date
Andreas Lauser 8b3a4a6e23 Merge pull request #207 from blattms/fix-multiple-dune-version-request-hickups
Request dune module versions only in the most upstream opm module.
2016-11-17 17:38:26 +01:00
Markus Blatt 6608bc87e4 Request dune module versions only in the most upstream opm module.
Otherwise we are running into weired problems as downstream modules
refuse to set the version information correctly. This leads to
unset DUNE_MODULE_VERSION_{MINOR,MAJOR,REVISION} in config.h.

This only happened for dune-istl which was first requested by opm-core
but that module did not set the version information. Opm-grid requested
it, too. But this time this information was not correctly put into
opm-grid-config.cmake leading to erroneous checks like:

if (DEFINED DUNE_ISTL_VERSION_MAJOR AND NOT "${DUNE_ISTL_VERSION_MAJOR}" STREQUAL "")
        message (WARNING "Incompatible value \"${DUNE_ISTL_VERSION_MAJOR}\" of variable \"DUNE_ISTL_VERSION_MAJOR\"")
endif ()

Note there should have been a number instead of an empty string. The version
numbers were also undefined in config.h of opm-grid. Same picture for opm-simulators.

My assumption is that for these modules Finddune-istl.cmake was implicitly included
when searching for opm-core. That module sets the version in the parent scope only
which might cause this problem. I am not sure though.

With this commit the version is always added to CONFIG_VARS for the first most upstream
OPM module that requests a dune module. This fixes the issue at least for me on my system.

Also note that this problem did not occur in all configurations. I experienced breaking
builds with the installed dune module 2.4.1 of Debian backports while using dunecontrol.
The warnings about unmatching versions happened with uninstalled 2.3, too.
2016-11-17 17:01:33 +01:00
Atgeirr Flø Rasmussen ec63c6b7fd Merge pull request #202 from atgeirr/warnings-fix
Silence warnings not from current module.
2016-11-16 10:14:46 +01:00
Andreas Lauser 05e1bd64a9 opm-material: actually check for valgrind
a config.h variable was already set but the actual test was not run
for opm-material.
2016-11-08 15:04:52 +01:00
Atgeirr Flø Rasmussen 5344392b99 Silence warnings not from current module. 2016-11-08 10:46:35 +01:00
Markus Blatt ebe3457064 Correctly use -std=c++<version> instead of -std=<version> with older CMake. 2016-11-04 16:25:32 +01:00
Markus Blatt dbad03c62f Correctly request compiler flags for feature tests 2016-11-03 12:09:10 +01:00
Markus Blatt 2ce0810f68 Readded lost ) 2016-11-03 12:05:58 +01:00
Markus Blatt 69da5816d6 Make c++14 available for CMake >=3.1 and do not test c++0x 2016-11-03 12:00:11 +01:00
Markus Blatt bf31f7b4e9 Force a search for installed cJSON when looking for opm-parser.
If the version within opm-parser was used then the symbols are
in libopmjson anyway.
2016-11-02 21:24:40 +01:00
Markus Blatt c7cf7d8144 Only search in PROJECT_SOURCE_DIR for cjson.
Otherwise will never find an installed version for downstream modules
as they will find the header in opm-parser but not library.
2016-11-02 21:22:58 +01:00
Markus Blatt 34ed49d765 Add external cJSON library to opm-parser_LIBRARIES. 2016-11-02 20:28:12 +01:00
Markus Blatt b75f24afc2 Use external instead of opm/json for suffixes to search for cjson of opm-parser. 2016-11-02 19:46:41 +01:00
Markus Blatt 1352e89d4e Make dune-grid compile test more generic 2016-10-26 13:42:42 +00:00
Markus Blatt b46d3df2f7 Find dune-grid 2.5 2016-10-26 13:19:40 +00:00
Markus Blatt 4d31c7efdc Activate -std=c++14 switch if compiler supports it.
This is needed to make OPM compile with 2.5. Otherwise dune-common
is not found because of missing std::decay_t support.
2016-10-25 09:41:29 +00:00
Robert Kloefkorn b9af87abc2 [bugfix] since HAVE_DUNE_ISTL is used in opm-grid it should be tested for. It's
not a hard dependency, though.
2016-10-18 17:30:22 +02:00
Arne Morten Kvarving e3793e3577 fixed: turns out skipping the (unnecessary) c++11 tests cause issues
these defines are not used in OPM, but they are used in headers
from dune. 10x cola for me.
2016-10-18 15:02:47 +02:00
Arne Morten Kvarving e329f502ba added: use cmake mechanisms to enable c++11 with cmake >= 3.1
as a bonus it makes it easy to experiment with c++14
2016-10-17 11:56:44 +02:00
Joakim Hove 8bb00bc1e2 Updated Findopm-output to reflect repo changes. 2016-10-07 11:31:38 +02:00
Pål Grønås Drange dac092dc8b Added FindCwrap, add to pythonpath 2016-10-04 12:57:38 +02:00
Arne Morten Kvarving 899730284a changed: update petsc module for newer petsc
newer petsc changed layout a bit. as of petsc 3.6.4 a
proper pkg-config file is ready for use.

additionally, align the find module with how petsc is expected to be
configured. the environment variable PETSC_DIR is the root of the source
tree and PETSC_ARCH is the build configuration, located in
$PETSC_DIR/$PETSC_ARCH

the old approach is kept for backwards compatibility but will not work
with newer petsc, in particular not if petsc is built static.
2016-09-29 14:17:31 +02:00
Andreas Lauser 9e0a5cea6c Merge pull request #177 from andlaus/optional_dune-localfunctions
make dune-localfunctions optional for eWoms
2016-09-22 17:20:04 +02:00
Arne Morten Kvarving 5d158d81e2 Merge pull request #176 from blattms/activate-dune-mpi-2-if-available
Check for MPI 2 functionality and activate it for DUNE.
2016-09-22 09:22:12 +02:00
Andreas Lauser 04d7375f9c make dune-localfunctions optional for eWoms
this is the build system side of OPM/ewoms#70...
2016-09-21 19:15:38 +02:00
Markus Blatt 333011212a Use MPI_C_* instead of MPI_CXX_* 2016-09-21 15:46:44 +02:00
Markus Blatt a7db2bfb2d Only search for MPI_Finalized with MPI found. 2016-09-21 15:46:01 +02:00
Markus Blatt a9d105c1a0 Check for MPI 2 functionality and activate it for DUNE.
This allow mixing the MPIHelper and MPI_Init/MPI_Finalize. This commit
makes OPM a bit more DUNE compatible.
2016-09-16 18:17:19 +02:00
Kristian Hole-Drabløs 909a00fade Changed name of cmake variables
Changed name of cmake variables due to namechange of binaries
2016-09-14 12:03:37 +02:00
Bård Skaflestad 29a1dcb6dc Update opm-flowdiagnostics system probe for API change
This commit brings the system probe for module

    opm-flowdiagnostics

up-to-date with recent changes in the public interface of the
module's main entry point.  Commit OPM/opm-flowdiagnostics@8456e81
removed the nested type

    Opm::FlowDiagnostics::Toolbox::PoreVolume

so we must drop all references to this type.
2016-08-31 22:07:46 +02:00
Andreas Lauser bf63963c0c FindQuadmath.cmake: fix the first argument of find_package_handle_standard_args()
It needs to match the filename exacly, i.e. including the case.
2016-08-24 14:56:08 +02:00
Andreas Lauser a742ddead4 opm_add_test: make it possible to hide disabled tests
the purpose is to make CI systems like travis happy because ctest
counts tests with status "(Not Run)" as failed and returns a non-zero
exit code.

hiding disabled ctests can be achived by adding the
-DADD_DISABLED_CTESTS=OFF cmake parameter.
2016-08-22 12:09:30 +02:00
Joakim Hove 3535a43382 Update cmake / jenkins / travis due to ert reorg. 2016-08-20 18:20:32 +02:00
Bård Skaflestad 34c4173dc3 Hook FD-Applications up to OPM build system
This commit recognizes the opm-flowdiagnostics-applications module
in OPM's centralised build system.  We make requisite changes to the
FIND support for module opm-flowdiagnostics (header 'tarjan.h' is
currently not public) and make a first cut at explicit prerequisites
for FD-Applications.
2016-08-17 12:25:20 +02:00
Kristian Hole-Drabløs c5f3c1eca1 Added commands for running regression test binaries 2016-07-19 09:52:29 +02:00
Joakim Hove 0d261d24f3 Update FindERTPython to check for EclSum. 2016-07-01 15:13:46 +02:00
Joakim Hove 7064cde08b Run Python / ERT based integration tests.
Added a new optional dependency the ERT Python distribution to
opm-simulators, and a cmake function 'opm_add_python_test' which can be
used to simplify integration tests of the type:

 1. Run flow on a model.
 2. Compare the results with a well known reference solution.
2016-06-29 20:03:26 +02:00
Joakim Hove 03b5b8e785 Updates to FindERTPython:
- Fixed bug: CMAKE_INSTALL_PREFIX -> CMAKE_PREFIX_PATH
 - Factored out path component ${PYTHON_INSTALL_PREFIX}
2016-06-28 11:28:05 +02:00
Joakim Hove 6d18022e19 FindERTPython will consider CMAKE_INSTALL_PREFIX. 2016-06-27 13:03:40 +02:00
Atgeirr Flø Rasmussen c753787c84 Merge pull request #147 from andlaus/remove_std_regex_test
FindCXX11Features.cmake: remove the test for `std::regex`
2016-06-23 07:34:24 +02:00
Joakim Hove 3e57bfd844 FindERT: look for ert_util C++ wrappers. 2016-06-22 16:12:35 +02:00
Andreas Lauser 1ea00e5602 FindCXX11Features.cmake: remove the test for std::regex
this test is quite fragile, takes relatively long and after
OPM/opm-parser#850 it is not required anymore.
2016-06-16 14:34:08 +02:00
Joakim Hove c089761bc9 Merge pull request #146 from jokva/remove-boost-dependencies-from-output
Remove boost dependencies from output except test
2016-06-14 10:35:34 +02:00
Arne Morten Kvarving 577088d80e Merge pull request #145 from jokva/new-find-opm-output
Change Find-output test source code
2016-06-13 15:57:33 +02:00
Jørgen Kvalsvik 5ad08b3843 Change Find-output test source code
opm-output is about to remove the OutputWriter.hpp header, which means
this test program will break. Wells.hpp and default-constructed
data::Rates is a better fit for the future.
2016-06-13 15:13:24 +02:00
Jørgen Kvalsvik c1e48b969c Remove boost dependencies from output except test 2016-06-13 14:44:22 +02:00
Arne Morten Kvarving 080a3ff687 fixed: set correct config variable 2016-06-13 10:44:01 +02:00
Joakim Hove 2ec97ba27f Merge pull request #127 from magnesj/vs2015-compile-fixes
VS2015 : Improvements to FIND functions for ERT and find_opm_package
2016-06-10 13:17:26 +02:00
Jørgen Kvalsvik 86a1d87a74 Swap opm-core/opm-output dependencies
Core depends on output, not the other way around.
2016-06-10 12:53:20 +02:00
Bård Skaflestad 0a0332d4e3 Recognize OPM-Flowdiagnostics as an OPM Module
This enables using the OPM build system in the new module

    opm-flowdiagnostics.
2016-06-08 16:59:52 +02:00