Commit Graph

490 Commits

Author SHA1 Message Date
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
Markus Blatt
6c0438ab81 Whitespace change that replaces introduced tab with spaces. 2014-02-06 12:41:10 +01:00
Markus Blatt
322da86bb1 [cmake] Makes arbitrary build subdirectories possible.
Instead of guessing the suffix or subdir of the build directory,
we now simply compare PROJECT_{BINARY,SOURCE]_DIR to detect it.
By this e.g. opm-core/opm-parallel is a possible build directory, too.
2014-02-06 11:03:59 +01:00
Joakim Hove
6c8cba9d19 Merged upstream/master 2014-02-04 21:42:07 +01:00
Joakim Hove
bfbc62655d Merge remote-tracking branch 'upstream/master' into opm-parser-integrate 2014-01-29 11:02:21 +01:00
Markus Blatt
64585b355f Corrects required version and make Eigen3 download work.
At least on Debian requiring version 3.1 of Eigen3 is not sufficient
according to issue #25 the minimum version is 3.1.2. This patch fixes
the required version. In addition it skips the REQUIRED option passed
to find_package(Eigen3) to make the git download work.

Fixes #25.
2014-01-24 15:35:20 +01:00
Atgeirr Flø Rasmussen
a3da7335ca Merge pull request #475 from rolk/475_dunedef
Alias probed CMake variables to names that DUNE require
2014-01-24 06:12:34 -08:00
Roland Kaufmann
fc231e8978 Declare a need to know if BOOST is available
Note that the variable HAVE_DUNE_BOOST is not set by FindBoost,
but by OpmAliases.
2014-01-24 13:58:48 +01:00
Roland Kaufmann
981fe79429 Declare a need to know if UMFPACK is available
Note that the variable HAVE_UMFPACK is not set by FindSuiteSparse,
but by OpmAliases.
2014-01-24 13:58:48 +01:00
Roland Kaufmann
60c54705c0 Create aliases for probed variables
Headers from other libraries (notably DUNE) require definitions of
other variables than our probe process set (e.g. HAVE_UMFPACK instead
of HAVE_SUITESPARSE_UMFPACK_H). This module sets those aliases for
compatibility.
2014-01-24 13:58:47 +01:00
Atgeirr Flø Rasmussen
1d1dc493e8 Merge pull request #448 from andlaus/prevent_multiple_package_detections
OpmFind.cmake: prevent multiple calls to the same module in the same run
2014-01-24 04:39:27 -08:00
Atgeirr Flø Rasmussen
926dfe295b Merge pull request #450 from andlaus/add_message_type
cmake: make sure all calls to message() exhibit a type
2014-01-24 00:36:51 -08:00
Joakim Hove
4891a09d6a Merge remote-tracking branch 'upstream/master' into opm-parser-integrate 2014-01-24 08:59:22 +01:00
Bård Skaflestad
806be98a95 Merge pull request #456 from rolk/456_blddoc
Document modules and structures in the build system
2014-01-15 01:07:13 -08:00
Roland Kaufmann
e79a65bb81 Terminology instead of Notation as section header
Notation implies that we are going to be given symbols which
represents values or such (which arguably could be true since the
path is a particular value, and from programming we are used to
multi-letter symbols perhaps also with whitespace, but it's a
stretch), but Terminology is more accurate, as this section
describes fits the definition better: it is a vocabulary of
technical terms.

Hat tip: @bska
2014-01-15 09:08:00 +01:00
Roland Kaufmann
d5a3db50c5 Document modules and structures in the build system
Give a brief description of each of the modules that comprises the build
system, and the suffices that is used to form a virtual structure of
variables for each project.
2014-01-14 21:14:17 +01:00
Joakim Hove
42d058c6db Merge remote-tracking branch 'upstream/master' into opm-parser-integrate 2013-12-16 16:58:22 +01:00
Andreas Lauser
48751432a5 OpmFind.cmake: also check for CAPITALIZED found variables
thanks to @rolk for catching this
2013-12-16 09:34:59 +01:00
Andreas Lauser
5bf751e921 cmake: make sure all calls to message() exhibit a type 2013-12-15 18:25:52 +01:00
Andreas Lauser
92d1f463d9 OpmFind.cmake: prevent multiple calls to the same module in the same run
this prevents to check for the same module more than once in the same
cmake run and should thus speed things up a bit as well as make the
output a bit cleaner. For this I assumed that the ${name}_FOUND cmake
variable does not get cached, which it seems like it does not...
2013-12-15 17:56:37 +01:00
Roland Kaufmann
ee7f4242b5 Only add linker option if it is not really there
This code is run unconditionally each time we do a reconfigure; if the
option is added at each time, they will accumulate (needlessly) on the
command-line, making it harder to inspect the log.
2013-12-10 21:01:22 +01:00
Joakim Hove
d0fb8655da Merge remote-tracking branch 'upstream/master' into opm-parser-integrate 2013-12-08 18:38:38 +01:00
Roland Kaufmann
a9e71c0d84 Provide CMake find module for opm-autodiff
If the module root is not explicitly specified, the loading of its
configuration is delegated to a find module, which does a heuristic
search in known/surrounding directories. Most OPM modules use the
common logic in OpmPackage; this patch configures the search
specifically for opm-autodiff.
2013-12-06 23:31:57 +01:00
Roland Kaufmann
a62e2f4770 Search after new Eigen3 versions in sibling dirs
If we have checked out a newer Eigen3 directory in a sibling directory
to ours, assume that this is because the system version is obsolete and
that we want to use this one instead.
2013-12-06 23:26:57 +01:00
Roland Kaufmann
7d75c4f058 If given build tree as Eigen3 root, find source
Eigen3 is a template-library, so we must compile the source code
directly together with ours instead of linking to a library.

If the build script gives us the location of a "built" Eigen3,
meaning a directory in which CMake has been run, locate the true
source directory from the cache entries.
2013-12-06 23:26:37 +01:00
Joakim Hove
b8d6a22fb9 Merge remote-tracking branch 'upstream/master' into opm-parser-integrate 2013-11-27 14:06:30 +01:00
Joakim Hove
ae10f3b111 Merge remote-tracking branch 'upstream/master' into opm-parser-integrate 2013-11-25 15:54:01 +01:00
Andreas Lauser
59e234b4d9 configure: fix all except one warning produced by shellcheck
thanks to @bska for pointing this tool out!
2013-11-25 14:51:59 +01:00
Bård Skaflestad
1467a16a34 Merge pull request #439 from andlaus/fix_configure_syntax_error
fix syntax error in configure shell script
2013-11-25 03:52:30 -08:00
Bård Skaflestad
6c56cff450 Merge pull request #436 from rolk/436_searchdir
Search in build/ sub-dir if only suite root is given
2013-11-25 02:29:41 -08:00
Andreas Lauser
c1fc5c53c6 fix syntax error in configure shell script
strangly enough, it seems to work like it was in some circumstances...
2013-11-22 18:39:49 +01:00
Joakim Hove
2b65421d4e Merge remote-tracking branch 'upstream/master' into opm-parser-integrate 2013-11-22 10:23:11 +01:00
Roland Kaufmann
3c3e14daed Merge pull request #430 from andlaus/fix_infinite_configure
build system: prevent endless loop when using dunecontrol
2013-11-21 03:07:34 -08:00
Joakim Hove
70505ffcb3 Raised the opm-core boost dependency to 1.44 to reflect parser requirement 2013-11-18 13:24:53 +01:00
Roland Kaufmann
9e54d276bd Only add parent directories for actual variants
Otherwise we'll inadvertedly add the root directory and will probably
find the system implementation underneath there.
2013-11-18 13:19:58 +01:00
Roland Kaufmann
6d433017a4 Only add build sub-directory if it is actually used
Otherwise the search will cascade down one level too many.
2013-11-18 13:19:18 +01:00
Roland Kaufmann
4379ee8da6 Search in build/ sub-dir if only suite root is given
If the package suite was given (e.g. DUNE_ROOT=/blum), then the code
set up the root for each individual package automatically (e.g.
DUNE_COMMON_ROOT=/blum/dune-common), but the path which was then
activated did not get the local build sub-directory (e.g. if we are
building opm-autodiff in /frub/opm-autodiff/build, then the local
build directory is "build/"), and thus this was not appended to the
library search path. The result was that the source was found (because
the root pointed to a valid source tree), but the library was not
(because it is "hidden" in the subdirectory).
2013-11-18 11:21:06 +01:00
Joakim Hove
954203fb83 Added CJSON_INCLUDE_DIRS to OPM_PARSER_INCLUDE_DIRS 2013-11-15 15:40:42 +01:00