Commit Graph

3052 Commits

Author SHA1 Message Date
Roland Kaufmann
1e765a2f29 Don't probe for umfpack with cholmod unless latter is found 2013-03-12 12:22:57 +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
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
Roland Kaufmann
a6a8170b50 Use keyword supported by older version of CMake
The CONFIG keyword to find_package () was introduced in 2.8.8 while
NO_MODULE works for the entire 2.8.x series.
2013-03-07 10:45:36 +01:00
Atgeirr Flø Rasmussen
66d1f396f8 Merge pull request #178 from rolk/178_openmp
Require explicit enabling of experimental OpenMP support
2013-03-07 00:17:50 -08:00
Atgeirr Flø Rasmussen
f767a74097 Merge pull request #177 from rolk/177_fastert
Determine that ERT is not found, faster
2013-03-07 00:17:35 -08:00
Atgeirr Flø Rasmussen
3a096c5810 Merge pull request #176 from rolk/176_optcheck
Perform option checking in ./configure like autotools does
2013-03-07 00:17:21 -08:00
Roland Kaufmann
252d853147 Disable use of OpenMP by default
If support for OpenMP should be added, it must be specified by
setting an option. If not, then warnings for unknown pragmas are
disabled, so that the code can have #pragma omp witout getting
messages during build.
2013-03-07 00:17:46 +01:00
Roland Kaufmann
269f33535b Bugfix wrong variable used
But since it added the option anyway, this was hard to catch (unless
one was trying to set both options at the same time)
2013-03-07 00:17:45 +01:00
Roland Kaufmann
8946c17330 Determine that ERT is not found, faster
Instead of checking every pre-requisite and then determine if the
library is functional, quickly check if the library directories are
present, and if not bail out. The most common reason that ERT is
not usuable, is that it is installed, not that something else is
missing!
2013-03-06 22:18:21 +01:00
Roland Kaufmann
9bfeb12410 Only make actual directory names canonical
If the directory that is specified does not exist, then keep the path
as entered, which makes for better error messages later.

We cannot print an warning on a non-existent name, because it may be
target directories that are specified, or perhaps logical options
(like --with-mpi=yes)
2013-03-06 22:08:42 +01:00
Roland Kaufmann
38353a891c Allow variables and options in any order
Traditionally, options are put before any other command-line arguments.
However, dunecontrol puts variable assignment before options, like env,
and this confuses getopt.

This variant (based on a suggestion by Andreas Lauser) collects the
variables into an array at the same time as the options are processed.
2013-03-06 22:08:16 +01:00
Roland Kaufmann
3f7e1f5002 Only warn for unknown --enable/--with options
Follow the guidelines in
<http://www.gnu.org/savannah-checkouts/gnu/autoconf/manual/autoconf-2.69/
html_node/Option-Checking.html#Option-Checking>
and print a *warning* if there is an unknown --enable-* or --with-*
option, error otherwise. --disable-option-checking does not turn off the
errors, but silences the warnings.
2013-03-06 22:07:45 +01:00
Bård Skaflestad
fd383d7b50 Merge pull request #175 from rolk/175_dunemod
Enable dunecontrol to use a build tree as module dir
2013-03-06 12:34:17 -08:00
Roland Kaufmann
5658c8b624 Enable dunecontrol to use a build tree as module dir
dunecontrol looks for a dune.module to determine whether a directory
contains a module or not. By copying this file to the build tree, we
can use (out-of-source!) build trees in dunecontrol too.
2013-03-06 20:00:42 +01:00
Atgeirr Flø Rasmussen
89f8068685 Merge pull request #174 from rolk/173_havecached
Handle ERT not found condition gracefully
2013-03-06 05:37:11 -08:00
Atgeirr Flø Rasmussen
bc95a20753 Merge pull request #173 from totto82/doxygen
changes to tutorials and doxylocal
2013-03-06 05:36:56 -08:00
Atgeirr Flø Rasmussen
c91f0171ab Merge pull request #172 from rolk/172_confmode
Encourage the use of config mode if available
2013-03-06 05:13:39 -08:00
Roland Kaufmann
35353befb2 Handle ERT not found condition gracefully
If the files for ERT is not found, then the find module cheats and
indicates that it didn't compile either (since there are some later
tests for HAVE_ERT).

However, erraneously, it gave this variable the value 0, which tests
for false in the CMake code but not in the #ifdef checks in the C++
code. This error is cancelled in opm-core by the fact that it didn't
store it as a cache variable, but resurfaced in opm-polymer when it
probes the second time (as both opm-core as a dependency and
opm-polymer itself declare a dependency on ERT).

It is now stored in a way that should be satisfactory to both
projects.
2013-03-06 13:31:04 +01:00
Tor Harald Sandve
c2506c9fb2 code is now included using \snippet. Apparently this looks better with the new Doxygen version. The HTML_EXTRA_STYLESHEET is now used rather then the HTML_STYLESHEET in order to include used-defined styles for the same reason 2013-03-06 10:17:27 +01:00
Roland Kaufmann
e75d69ef1d Use config mode if possible when finding packages 2013-03-05 22:29:20 +01:00
Roland Kaufmann
7104ac7dae Expand tilde used in command-line arguments
This enables one to specify e.g. --with-opm-core=~/opm/bld/opm-core
2013-03-05 22:12:11 +01:00
Atgeirr Flø Rasmussen
98fbb80fdc Merge pull request #171 from rolk/171_openmp
Refactor OpenMP support to be reusable
2013-03-05 06:32:43 -08:00
Roland Kaufmann
11bf7bf34e Propagate information about whether module was found quietly 2013-03-05 13:58:19 +01:00
Roland Kaufmann
e50c564425 Separate inclusion of OpenMP library into reusable module
Other projects (which does not have a direct dependency on ERT) require
OpenMP; we desire to reuse this functionality into those projects.
2013-03-05 13:52:52 +01:00
Roland Kaufmann
911bf9593f Do not duplicate handling of duplicate libraries
There were (at least) three implementations of the same macro; these
have been collected into a separate helper module. (Note that this
means that FindERT is now not completely stand-alone anymore).
2013-03-05 13:50:58 +01:00
Atgeirr Flø Rasmussen
a2f13f1c3f Merge pull request #170 from rolk/170_trimopts
Fix mysterious dropping of flags when specifying CXXFLAGS env.var.
2013-03-05 03:14:39 -08:00
Roland Kaufmann
f3b76ac8e3 Trim same amount from strings before comparing
If you specified options in an environment variable containing a blank
at the end, then this would not compare equal to the other candidate,
which was stripped, causing the first added argument to drop out! This
is usually the flag for C++11 compliance, causing binary incompatibility
2013-03-05 11:43:06 +01:00
Atgeirr Flø Rasmussen
0ac31dd871 Merge pull request #166 from rolk/166_upcase
Use uppercase consistently in configuration variable names
2013-03-05 00:49:33 -08:00