Commit Graph

3094 Commits

Author SHA1 Message Date
Markus Blatt
87f9cf8c77 Use 1e-8 as residual tolerance similar to istl. Added verbosity mode. 2013-03-18 14:34:03 +01:00
Atgeirr Flø Rasmussen
e59db97128 Merge pull request #205 from rolk/205_tinyxml
Dependent packages fail if opm-core uses embedded TinyXML
2013-03-18 05:12:20 -07:00
Roland Kaufmann
ce16450e43 Bugfix change from function to macro
This change is similar to commit 89be4e14: After find_package_append_to
changed from function to macro to pick up the configuration not only
from the module itself but also from everything it pulled it, the
variable MODULE is overwritten (variable module in lower case is a
parameter, so it is replaced in the source body). Thus, the test in the
end is not whether *this* module was found, but if its last dependency
was! This made the build crash only in some projects but not in others.
2013-03-18 10:32:53 +01:00
Atgeirr Flø Rasmussen
d86b4c09a4 Merge pull request #204 from rolk/204_precomp
Allow precompiled headers to be enabled from command-line
2013-03-17 13:10:37 -07:00
Roland Kaufmann
040b7adb4e Search for libraries in dunecontrol's default build dir 2013-03-17 21:03:19 +01:00
Roland Kaufmann
4d7752b980 Don't search for source in build directories 2013-03-17 21:03:09 +01:00
Roland Kaufmann
5401df41b5 Use find modules for libraries with extra processing
Some libraries require more information than what is present in the
xxx-config.cmake file, e.g. the caller must know whether HAVE_TUPLE
is available and probably used when compiling dune-common, and put
this in its own config.h file.

Code to take care of these variables must therefore be in the client
configuration, and this is the same code which is used to handle the
autotools version, namely the find module, so a practical solution
is to just revert to that in both cases.
2013-03-17 21:03:00 +01:00
Roland Kaufmann
6cfa13f136 Allow precompiled headers to be enabled from command-line 2013-03-15 20:06:40 +01:00
Bård Skaflestad
520d97c63a Merge pull request #202 from rolk/202_mpi
Allow MPI to be found and opm-core configured the same way as DUNE
2013-03-15 06:52:17 -07:00
Roland Kaufmann
9c1da9f5bf Bugfix don't search for module twice! 2013-03-15 13:48:43 +01:00
Roland Kaufmann
bafa781181 Search in dunecontrol build directories for other modules 2013-03-15 12:44:24 +01:00
Roland Kaufmann
88b0740480 Bugfix expand variable definition 2013-03-15 12:23:57 +01:00
Roland Kaufmann
89be4e145a Bugfix change from macro to function
All variables we introduce which is not parameters are in fact global
variables that may be overwritten by recursive invocation!
2013-03-15 11:40:30 +01:00
Roland Kaufmann
3f3ac283e8 Enable MPI support from DUNE with --enable-parallel 2013-03-15 11:40:30 +01:00
Roland Kaufmann
4fb05162cb Only use MPI if explicitly enabled
Running with MPI on a regular workstation will probably not increase
performance, so this should be disabled as default.
2013-03-15 11:38:45 +01:00
Roland Kaufmann
edd6b15497 Add MPI dependency for dune-common
mpihelper.hh needs to know HAVE_MPI in the same way as the compiled
library in order to generate a consistent interface.
2013-03-15 11:38:45 +01:00
Atgeirr Flø Rasmussen
606d69fd38 Merge pull request #201 from rolk/201_transitive
Allow variables from indirect dependencies to bubble up
2013-03-15 03:05:00 -07:00
Roland Kaufmann
f42bf41e15 Use our own find routine recursively
Don't use bare find_package in OpmPackage when we have already written
OpmFind to take out the worst warts.
2013-03-15 10:57:53 +01:00
Roland Kaufmann
ce007fca7d Abstract into common version and parameterize 2013-03-15 10:57:53 +01:00
Roland Kaufmann
3d252ae8f4 Allow variables from indirect dependencies to bubble up
The previous implementation was a function, which although OK from an
implementation standpoint -- the local variables doesn't pollute the
global namespace -- would not allow variables that were set in indirect
dependencies to bubble up to the main module. This is a problem for
modules which are dependent on configuration variables to be present.
2013-03-15 10:45:05 +01:00
Atgeirr Flø Rasmussen
d11d84c418 Merge pull request #199 from rolk/199_uppercase
Allow modules to use all-uppercase variables
2013-03-15 01:38:08 -07:00
Roland Kaufmann
ccbcb6f364 Enable debug tracing when finding modules 2013-03-15 01:24:06 +01:00
Roland Kaufmann
8dcca4cf9b Use camel-case in SuperLU's name
Originally, I added FindSuperLU with uppercase since the variables it
returned had that case. Now the scripts should be patched so that it
searched for uppercase amongst the variables as well, so the module
name can retain its original case (and for compatibility with DUNE)
2013-03-15 01:24:06 +01:00
Roland Kaufmann
97c2fabe8e Search for uppercase variants of the package vars as well
For compatibility with packages that believes that every variable
should be in uppercase, we try this variant when adding relevant
variables to the project.
2013-03-15 01:23:59 +01:00
Atgeirr Flø Rasmussen
94e5af16e7 Merge pull request #198 from joakim-hove/ert-add-ecl_file_open_flag
Added integer flag to ecl_file_open: To allign with ert commit: bd542a45
2013-03-14 10:32:17 -07:00
Joakim Hove
1781d1fb65 Added integer flag to ecl_file_open: To allign with ert commit: bd542a45c5e72 2013-03-14 16:15:28 +01:00
Atgeirr Flø Rasmussen
b2a07a93d5 Merge pull request #191 from atgeirr/make-io-subdir
Make io subdir
2013-03-13 05:45:53 -07:00
Bård Skaflestad
fb9e09063c Merge pull request #193 from rolk/193_arch
Don't search in architecture-irrelevant directories
2013-03-13 03:41:29 -07:00
Bård Skaflestad
ee748e6e64 Merge pull request #194 from rolk/194_bugfix
Test strings on length before content
2013-03-13 03:30:20 -07:00
Roland Kaufmann
44a638dce3 Test strings on length before content
A substring can of course not be longer that the full string. Also fixes
problems with CMake-versions that doesn't handle out-of-range parameters
to the SUBSTRING sub-command.
2013-03-13 11:20:28 +01:00
Bård Skaflestad
ae4b033ee7 Merge pull request #192 from rolk/192_findlibs
Probe for indirect library dependencies
2013-03-13 02:44:48 -07:00
Roland Kaufmann
ac861580d7 Don't search in architecture-irrelevant directories
If we are on a 64-bits machine, there is no point in searching lib32
and conversely. Quite the opposite, it can only end badly if a library
is actually found in the wrong architecture directory.
2013-03-13 10:38:27 +01:00
Roland Kaufmann
38bcff4e12 Allow subdir builds with dunecontrol
dunecontrol will check for a dune.module file to regard the directory
as containing the module. If we put this is a sub-dir of the source,
it will get confused, so we shouldn't. There shouldn't be any
conflicting use-cases, as one cannot have several modules in the sub-
directory of one source (!?).
2013-03-13 01:20:44 +01:00
Roland Kaufmann
54c89146d7 Enable CMake < 2.8.5 clients to report Git version 2013-03-13 01:02:03 +01:00
Roland Kaufmann
52a6b00752 Add direct dependency on dune-common
We need to link to the library provided by dune-common, but dune-istl
does not pull this one in transitively.
2013-03-13 00:02:54 +01:00
Roland Kaufmann
58dd4fd7b4 Include standard math runtime library when linking numerics 2013-03-13 00:01:41 +01:00
Atgeirr Flø Rasmussen
c1700e663e Changed overlooked include path. 2013-03-12 13:36:29 +01:00
Roland Kaufmann
1e765a2f29 Don't probe for umfpack with cholmod unless latter is found 2013-03-12 12:22:57 +01:00
Atgeirr Flø Rasmussen
2f99316d01 Merge remote-tracking branch 'upstream/release/2013.03' into make-io-subdir 2013-03-12 10:46:58 +01:00
Arne Morten Kvarving
d0004fcd76 fixed: remove non-existent files from install list
these were removed in dd43305748
2013-03-11 14:20:42 +01:00
Bård Skaflestad
144c5b9b59 Merge pull request #188 from rolk/188_maint
Add maintainer information
2013-03-08 08:48:23 -08:00
Bård Skaflestad
c56228982a Merge pull request #189 from andlaus/do_not_list_copyright_header
tutorial: make the copyright notice disappear in the HTML
2013-03-08 08:47:41 -08:00
Andreas Lauser
9e418e1779 tutorial: make the copyright notice disappear in the HTML
IMHO it is not useful there.
2013-03-08 12:26:42 +01:00
Roland Kaufmann
93d64033b2 Add maintainer information
This seems to have disappeared in one of my many edits of this file
when trying to set version number in it automatically.
2013-03-08 11:49:26 +01:00
Bård Skaflestad
879b29a951 Merge pull request #186 from rolk/186_configure
Simplify setting of flag that indicates shared object
2013-03-08 01:07:41 -08:00
Atgeirr Flø Rasmussen
c2a7ce9a45 Moved writeECLData and writeVtkData to opm/core/io subdirs. 2013-03-08 08:06:18 +01:00
Atgeirr Flø Rasmussen
ee271caae1 Moved opm/core/vag_format/ -> opm/core/io/vag/ 2013-03-08 07:54:56 +01:00
Atgeirr Flø Rasmussen
25867007ed Moved opm/core/eclipse/* to opm/core/io/eclipse/*. 2013-03-07 22:59:06 +01:00
Roland Kaufmann
f6d44238b1 Simplify setting of flag that indicates shared object
Instead of having the name of the module set for each flag, use the
available standard option. Mixing shared objects and static libraries
in the same build is not a very realistic scenario anyway.

This enables us to call configure without actually having a particular
module; the script may then be used on a group level.
2013-03-07 21:28:17 +01:00
Bård Skaflestad
dd43305748 Merge pull request #185 from atgeirr/minor-fixes
Minor fixes
2013-03-07 07:27:35 -08:00