Commit Graph

527 Commits

Author SHA1 Message Date
Andreas Lauser
38e0800047 FindQuadmath: add -fext-numeric-literals if the compiler supports it
this is required for GCC >= 4.8 to support the 'Q' suffix for floating
point literals (which are used in the quadmath.h header)

In order to prevent compilers which eat the flag but do not support it
from complaining constantly, it is tested for with "-Werror" enabled...
2014-08-18 12:16:04 +02:00
Andreas Lauser
29bed1cfb4 make the regex test more thorough
it seems like the std::regex delivered up to gcc 4.8 has problems with
constructs such as ".+". (at least if they appear at the end of a
regex...)
2014-08-08 16:13:30 +02:00
Joakim Hove
5039d44da6 Merge pull request #619 from andlaus/allow_static_ERT
ERT: link to the pthreads library
2014-08-07 13:25:34 +02:00
Andreas Lauser
c178ec365b ewoms: make it possible to use the dune-alugrid module instead of the ALUGrid manager in dune-grid 2014-07-30 12:53:17 +02:00
Andreas Lauser
713478d96d add support for the new DUNE-ALUGrid module
this is basically the dune-grid grid manager for ALUGrid properly
out-sourced into an own module. (it does not require an external
library anymore, so it simplifies the build quite a bit.) Also, the
DUNE-ALUGrid module has quite a few new features and performance
improvements compared to the old code from dune-grid. For details, see

http://users.dune-project.org/projects/dune-alugrid
2014-07-30 12:49:18 +02:00
Andreas Lauser
d624e9c9ec ERT: link to the threads library of the OS
this is required to make the opm-core build succeed if ERT was build
with -DBUILD_SHARED_LIBS=OFF . (without it, I get errors like

    /home/and/src/ert/devel/libert_util/src/thread_pool_posix.c:328: error: undefined reference to 'pthread_create'
2014-07-26 15:30:47 +02:00
Joakim Hove
662db75f3e Merge pull request #560 from andlaus/EclipseWriter_remove_EclipseHandle
Eclipse writer remove eclipse handle
2014-07-18 11:51:41 +02:00
Andreas Lauser
f1cf2549a9 Merge pull request #375 from akva2/fix_ert
this makes the build system more bullet proof. thanks
2014-07-16 16:31:46 +02:00
Arne Morten Kvarving
6c694141d2 fixed: ERT depends on libdl
this issue was triggered with static libs for ERT
2014-07-16 13:13:49 +02:00
Andreas Lauser
47a6aac24f Build system: mark ERT as REQUIRED
de facto, this does not change anything because opm-parser is required
and it has a hard dependency on ERT. It is good style to declare all
prerequisites explicitly in each module, though. Thanks to [at]bska
for the catch.
2014-07-16 10:41:24 +02:00
Andreas Lauser
dabe50d77d use extended regular expressions in the test for std::regex
for some compilers (e.g., GCC < 4.9) the default is buggy and
opm-parser thus uses extended expressions...

thanks to [at]bska for digging this up!
2014-07-08 13:24:34 +02:00
Andreas Lauser
c764c89da9 FindCXX11Features: check for a usable std::regex
and add a config.h variable in the opm-parser test.
2014-07-07 17:41:19 +02:00
Andreas Lauser
15b53895e5 Find-ewoms.cmake: update prerequisites 2014-07-02 16:49:07 +02:00
Andreas Lauser
5e369ac31e add the boost::regex library as a prerequisite
this is required for regex-matching keywords. Once GCC 4.9 is the
minimum compiler version to be supported, this can be dropped in favor
of std::regex ...
2014-06-29 14:40:30 +02:00
Andreas Lauser
1ef41b2733 Findopm-parser.cmake: Fix it up, next try
thanks to Arne Morten Kvarving, Bård Skaflestad and Roland Kaufmann
for the discussion.
2014-06-20 12:34:37 +02:00
Arne Morten Kvarving
1d506e49eb fixed: dune-cornerpoint (now) needs the dune-common version information 2014-06-18 15:36:31 +02:00
Arne Morten Kvarving
457ea2c44f added: hook for conditionally compiled files
backport from opm-upscaling PR#100
2014-06-16 14:40:52 +02:00
Bård Skaflestad
43c844b19f [buildsystem] Disable search for Boost in parser detection
This changeset disables the effect of commit e9a5e82.  There appears
to be an unforeseen interaction between the calls to

    Find_Package (Boost)

that are implied by module 'opm-parser-prereqs.cmake' and the one
that's directly invoked in 'Findopm-parser.cmake'.  Until the
situation can be fully analysed and a complete solution implemented,
this is a temporary measure to restore the build of opm-core and
downstream OPM modules.
2014-06-13 08:51:18 +02:00
Andreas Lauser
e9a5e82223 Findopm-parser.cmake: invoke FindBoost unconditionally
even if boost was found previously, it might still miss a few
libraries. thanks to @akva2 for catching this.
2014-06-12 21:46:18 +02:00
Andreas Lauser
47ba95d4eb Findopm-parser.cmake: make sure that the ERT libraries are available
and some other minor cleanups to the module. For me it still works,
but this being the build system, I can't guarantee more...
2014-06-11 22:24:34 +02:00
Bård Skaflestad
a51296a3b1 Merge pull request #574 from andlaus/allow_opm-parser_to_fail
allow the opm-parser test to fail
2014-04-23 19:51:09 +02:00
Atgeirr Flø Rasmussen
c62dfe5219 Merge pull request #576 from bska/sync-build
[buildsystem] Make dune-cornerpoint a suggestion.
2014-04-22 10:34:57 +02:00
Bård Skaflestad
3038f532ff Merge pull request #577 from andlaus/make_as_needed_optional
Make as needed optional
2014-04-22 10:29:18 +02:00
Atgeirr Flø Rasmussen
773cbc96d2 Fix option name to match name in use in conditional.
Also add a useful doc string.
2014-04-22 09:50:29 +02:00
Andreas Lauser
a3d9ce9fbd make the "-Wl,--as-needed" flag optional
as there is not much harm done if it is not used but it may cause the
build to fail if it is present (read: it causes _my_ build to fail),
it defaults to OFF.
2014-04-16 12:05:29 +02:00
Andreas Lauser
8c8c7191cf do not add the "-Wl,--as-needed" linker flag in FindSuiteSparse.cmake
because if umfpack is fully linked but some other library is
underlinked, it causes the build to fail. This flag is better dealt
with in the "UseOnlyNeeded.cmake" module...
2014-04-16 12:00:56 +02:00
Markus Blatt
cd18b3e110 [buildsystem] Make dune-cornerpoint a suggestion. 2014-04-16 01:45:53 +02:00
Bård Skaflestad
d9c91ff5eb Merge pull request #555 from andlaus/add_ug_support
add support for the UG grid library
2014-04-16 00:31:16 +02:00
Andreas Lauser
b82dd41b5e allow the opm-parser test to fail
since the module currently calls the tests for cJSON and boost with
the REQUIRED flag set, cmake aborts completely even if opm-parser is
not REQUIRED. For modules which depend on opm-core that's currently a
non-issue because core has a requirement on parser, but the parser may
be useful for external projects as well, so we play nice.

Also, with this patch the config.h variable HAVE_OPM_PARSER is set...
2014-04-15 20:42:49 +02:00
Atgeirr Flø Rasmussen
2a29deff1c Change option name and generated header names. 2014-04-15 20:21:10 +02:00
Atgeirr Flø Rasmussen
138f4f7aba Added more warnings to suppression list, sorted list. 2014-04-15 19:46:16 +02:00
Atgeirr Flø Rasmussen
c603103a3d Merge remote-tracking branch 'akva2/quell_dune_warnings' into suppress-external-warnings 2014-04-15 14:35:01 +02:00
Bård Skaflestad
e434000f4e Search for MPI support
The build system depends on knowing if MPI is available.  Explicitly
search for MPI to honour that requirement.  Don't rely on ISTL's
transitive searching for the same.
2014-04-07 20:01:18 +02:00
Andreas Lauser
b7d571efe2 add support for the UG grid library
recently UG has become free software (yay!), so we can now support it
with a good conscience. The CMake module is based on the "UseUG.cmake"
module of dune-grid but it is quite a bit simpler and actually
works. (I cannot see how UseUG.cmake can work without ever including
the ug-config*.cmake files...)

the UG source code is available here:

https://github.com/ugfem/ug
2014-04-02 16:01:55 +02:00
Markus Blatt
66a4889771 [cmake] Export HAVE_DUNE_ISTL for other modules.
This is e.g. needed in the parallel version of autodiff to
test whether ISTL is there.
2014-03-27 11:45:34 +01:00
Kristian Flikka
53656841b5 Only look for BOOST´s unit test framework module if not already found. Sync version with rest of system 2014-03-11 18:24:11 +01:00
Arne Morten Kvarving
50b2c9e56a add option to quell dune(-istl) warnings 2014-03-05 09:27:47 +01:00
Bård Skaflestad
121c3911cb Elucidate description string for opm-parser.
The 'opm-parser' module is (currently) designed to parse ECL-type
simulation models.  Reflect that fact in its description.
2014-03-03 15:44:16 +01:00
Bård Skaflestad
c68667458e Defer searching for opm-parser
The "opm-parser" module is expected to become dependent upon the ERT
library.  Defer searching for the parser module until we've
established whether or not ERT is availble.

Suggested by: @andlaus
2014-03-03 15:05:53 +01:00
Bård Skaflestad
d9db5da62e Restore C++-11 checks
While reformatting the parser-prereqs file I accidentally replaced
the feature search 'CXX11Features' with 'CXX10Features'.  This
commit fixes that blunder.
2014-02-28 22:07:27 +01:00
Bård Skaflestad
90ebf7b56d Fix mis-merge.
In propagating the requirements for opm-benchmarks to the other
modules I accidentally removed the 'opm-parser' prerequisite (see
commit 86439d6 for details).  This commit restores that prerequisite.
2014-02-28 20:00:44 +01:00
Bård Skaflestad
47d0956d64 Depend on Boost.Iostreams
The benchmark library uses Boost::iostreams to do decompression. Since
we only scan for the Boost dependency once, this submodule is added to
all of the projects in order to have a coherent dependency on Boost.
2014-02-28 19:13:46 +01:00
Bård Skaflestad
9fcd3d8181 Reformat prerequisite file according to convention
This commit makes a few adjustments to the white-space of file
'opm-parser-prereqs.cmake' to honour the conventions of the other
*-prereqs.cmake files within the OPM project's module suites.

No functional changes.
2014-02-28 19:06:42 +01:00
Bård Skaflestad
514240d0eb Uniformly raise Boost version requirement to 1.44
Commit 70505ff raised opm-core's "Boost" requirement to version 1.44
in order to reflect the requirements of the opm-parser module.  This
commit propagates that requirement to all other known modules.
2014-02-28 18:29:19 +01:00
Roland Kaufmann
ac61cde15f Depend on Boost::iostreams
The benchmark library uses Boost::iostreams to do decompression. Since
we only scan for the Boost dependency once, this submodule is added to
all of the projects in order to have a coherent dependency on Boost.
2014-02-28 18:22:33 +01:00
Roland Kaufmann
54fbd6b190 Provide dependency information for opm-benchmarks 2014-02-28 18:21:33 +01:00
Atgeirr Flø Rasmussen
ae4c6eab18 Merge pull request #490 from blattms/make-arbitrary-sibling-possible
[cmake] Makes arbitrary build subdirectories possible.
2014-02-06 23:39:57 +01:00
Markus Blatt
61b3a4618c [cmake] Do not use find_package in config mode for opm-parser.
Currently opm-parser does not create opm-parser-config.cmake files. Therefore
building with duncontrol fails as it sets opm-parser_DIR. With this patch
we force CMake to always use module mode for finding which fixes this.
2014-02-06 13:29:01 +01:00
Markus Blatt
786aa125f2 Removed printf debugging messages 2014-02-06 13:21:23 +01:00
Markus Blatt
00b802dd41 [cmake] Support more arbitrary sibling/subdir build directories for opm-parser. 2014-02-06 13:17:43 +01:00