Commit Graph

3078 Commits

Author SHA1 Message Date
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
Atgeirr Flø Rasmussen
ac49972082 Remove more unused mex-interfaces. 2013-03-07 16:17:40 +01:00
Atgeirr Flø Rasmussen
d63d1e7121 Removed some unused mex-interfaces. 2013-03-07 15:18:10 +01:00
Atgeirr Flø Rasmussen
a72bacbd31 Fix error in doc. 2013-03-07 15:14:24 +01:00
Atgeirr Flø Rasmussen
203d136fc2 Make destructor of CompressibleTpfa virtual. 2013-03-07 15:14:01 +01:00
Atgeirr Flø Rasmussen
fc2d6ee81f Merge pull request #181 from rolk/182_openmp
Probe explicitly for OpenMP
2013-03-07 05:47:25 -08:00
Bård Skaflestad
144be75cea Merge pull request #182 from rolk/181_opmgrid
Recreate grid selection macros from DUNE
2013-03-07 05:39:24 -08:00
Bård Skaflestad
73f4e0d447 Merge pull request #184 from rolk/184_constexpr
Probe for more C++ features that are used to conditionally disable source code in configuration
2013-03-07 05:38:27 -08:00
Roland Kaufmann
e507e18eed Check for tuple support 2013-03-07 14:27:41 +01:00
Roland Kaufmann
9280a2d9ff Check for constexpr attribute 2013-03-07 14:25:24 +01:00
Roland Kaufmann
c7db7805d1 Recreate grid selection macros from DUNE
This duplicates functionality from the old autotools implementation
in case any user code needs it. It is not necessary to build the
OPM modules themselves.
2013-03-07 13:55:51 +01:00
Roland Kaufmann
406874bf6b Probe explicitly for OpenMP
opm-core contains code which has #pragma omp. Earlier, OpenMP was
detected as part of the probe for ERT. However, that probe got
smarter, and as a result doesn't probe for more than it needs. Thus,
we need to check for OpenMP explicitly in opm-core. (It is disabled
by default)
2013-03-07 13:51:57 +01:00
Bård Skaflestad
316c691c81 Merge pull request #180 from rolk/180_compver
Diagnose compiler version in configuration output
2013-03-07 04:14:15 -08:00
Roland Kaufmann
c81bd58c3f Update regular expression to handle more variants
Older CentOS versions returns the version string on this format:

    gcc (aaa) x.y.z yyyymmdd (bbb)
2013-03-07 12:29:23 +01:00
Bård Skaflestad
fd8024128c Merge pull request #179 from rolk/179_nomodule
Use keyword supported by older version of CMake
2013-03-07 02:25:38 -08:00
Roland Kaufmann
3ae89d0754 Print compiler version number when configuring 2013-03-07 11:23:51 +01:00
Roland Kaufmann
bc4057a0d4 Provide function that identifies compiler to patch-level
Some distributions modify -dumpversion so that it only returns major
and minor numbers, not the patch level. This is usually OK for
determining features, but when debugging the output log, we really
want the full number.
2013-03-07 11:22:32 +01:00