OilfieldToolsNet/opm-core
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
3,131 Commits 9 Branches 35 Tags 15 MiB
5fba4ca2b3
Commit Graph

3131 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Atgeirr Flø Rasmussen
f44db76a72 Merge pull request #169 from rolk/169_havetest 
Check that test prog. compiled before declared found
 2013-03-05 00:40:40 -08:00
Atgeirr Flø Rasmussen
596cab180b Merge pull request #168 from rolk/168_distclean 
Also clean the temporary config-var file
 2013-03-05 00:40:17 -08:00
Atgeirr Flø Rasmussen
30bea36c58 Merge pull request #167 from rolk/167_quoted 
Handle quoted assignment arguments with whitespace
 2013-03-05 00:39:53 -08:00
Roland Kaufmann
3febb086dc Check that test prog. compiled before declared found 
The previous version did the test and setting of the config variable
right, but reported that the module was found only if the files were
located, independently of the result of the compile.
 2013-03-04 23:41:41 +01:00
Roland Kaufmann
3c5a73e9c4 Reuse the uppercase variant across the entire function 2013-03-04 23:33:30 +01:00
Roland Kaufmann
3bc25d5dee Also clean the temporary config-var file 2013-03-04 23:11:52 +01:00
Roland Kaufmann
a09d9fa919 Handle quoted assignment arguments with whitespace 
If we are going to set e.g. CXXFLAGS to more than one value, the
quotes must be preserved at the same time as the list is laundered
(for autotools-variables)
 2013-03-04 22:48:44 +01:00
Roland Kaufmann
be9b33e687 Use uppercase for the shared-object variable as well 2013-03-04 21:58:36 +01:00
Roland Kaufmann
cdfe3a7b66 Consolidate package location variables 
Always use the same form of package location variable, to maintain
consistency.
 2013-03-04 21:51:59 +01:00
Roland Kaufmann
5f490648ab Allow common _ROOT suffix in addition to original _PREFIX 2013-03-04 21:30:23 +01:00
Roland Kaufmann
76786442ce Allow uppercase variant of package root also 
Both the straight-forward mod-ule_ROOT variable and the more idiomatic
MOD_ULE_ROOT variant are allowed when specifying where to look for a
package.
 2013-03-04 21:25:18 +01:00
Atgeirr Flø Rasmussen
78a0a11e3d Merge pull request #165 from rolk/165_files 
Read filenames from an explicit file instead of globbing
 2013-03-04 06:04:02 -08:00
Roland Kaufmann
4942763ddd Use temp file for config vars to avoid rebuild 
When generating the config.h configuration file, write to a temporary
first and then rename afterward to avoid touching the file and thus
triggering a complete rebuild (of everything that includes config.h)
unnecessarily.
 2013-03-04 14:00:06 +01:00
Roland Kaufmann
234be65229 Specify source files explicitly rather than with glob 
Files which constitutes compilation units are now specified explicitly
in the file CMakeLists_files.cmake rather than identified through a
glob. If this file is updated, a reconfigure should be triggered.

This also enables us to specify exactly which headers that should be
distributed as part of the installation package, and which programs
that should be used for unit testing.
 2013-03-04 12:25:20 +01:00
Atgeirr Flø Rasmussen
0bfe185d43 Merge pull request #164 from atgeirr/remove-gnumakefile 
Remove confusing GNUmakefile and document cmake building process.
 2013-03-04 01:20:24 -08:00
Atgeirr Flø Rasmussen
7fe7ead8d0 Merge pull request #161 from rolk/161_findmods 
Provide extra find modules for all OPM modules
 2013-03-04 01:17:26 -08:00
Roland Kaufmann
e3a9a40ae6 Find module for opm-polymer 2013-03-04 09:46:33 +01:00
Roland Kaufmann
11d5f9aa91 Find module for opm-upscaling 2013-03-04 09:46:33 +01:00
Roland Kaufmann
1c93c19bf9 Find module for opm-porsol 2013-03-04 09:46:33 +01:00
Roland Kaufmann
dda6155081 Find module for dune-cornerpoint 2013-03-04 09:46:33 +01:00
Roland Kaufmann
6a2323c34a Provide easy way to disable an entire directory 2013-03-04 09:46:33 +01:00
Roland Kaufmann
8b13ffee6b Only attempt to use precompiled headers that exists 2013-03-04 09:46:33 +01:00
Roland Kaufmann
a35e0d23e3 Probe with include dirs to ALL dependencies 
It may be that the header in the test is dependent on some other header
in one of the dependencies.
 2013-03-04 09:46:33 +01:00
Roland Kaufmann
7ef129d708 Allow optional packages in find-module package list 2013-03-04 09:46:33 +01:00
Roland Kaufmann
39880c255e Updated dependencies (most notably LibXML2 -> TinyXML) 2013-03-04 09:46:32 +01:00
Roland Kaufmann
dc3d94e985 Activate Fortran interface on demand 
Not only if we need to compile Fortran code, but also if we need to call
some functions from a Fortran library from C code.
 2013-03-04 09:46:32 +01:00
Roland Kaufmann
7871a48551 Make sure HAVE_FOO is defined if foo_FOUND in CMake 2013-03-04 09:46:32 +01:00
Roland Kaufmann
4ad50b09e3 Infer project name from dune.module 2013-03-04 09:46:32 +01:00
Roland Kaufmann
03ccc506bd Find modules for dune-geometry and dune-grid 2013-03-04 09:46:32 +01:00
Roland Kaufmann
d9980beef1 Guess where libraries are using full path 
Because the probe is run from the project source tree(!)
 2013-03-04 09:46:32 +01:00
Roland Kaufmann
dfe6dbbb35 Handle all DUNE and OPM modules the same way 
dunecontrol will specify --with-* for each and every module that is
listed as a dependency in dune.module; there is no difference between
them because they all share the same code :-)
 2013-03-04 09:46:32 +01:00
Atgeirr Flø Rasmussen
b4af41ffa4 Merge pull request #2 from bska/remove-gnumakefile 
Expand instructions for separate build directory
 2013-02-26 12:21:14 -08:00
Bård Skaflestad
6c556308e8 Expand instructions for separate build directory 
This, hopefully, makes the steps a bit more clear by introducing an
explicit layout example to which the command sequences can relate.
 2013-02-26 19:09:00 +01:00
Atgeirr Flø Rasmussen
c5ccf7e093 Remove GNUmakefile, document cmake building. 
The README now suggests using nice and make -j for multicore machines.
 2013-02-25 17:45:22 +01:00
Atgeirr Flø Rasmussen
fbc8c6614c Merge pull request #158 from rolk/158_yum_apel 
Describe how to get extra packages from OPM repo
 2013-02-25 08:32:15 -08:00
Atgeirr Flø Rasmussen
d9379d5662 Merge pull request #162 from bska/release-cleanup 
Release cleanup
 2013-02-25 07:22:43 -08:00
Bård Skaflestad
96312d35bc Merge pull request #154 from akva2/debian_packaging 
added:  debian packaging control files
 2013-02-24 04:35:49 -08:00