Commit Graph

2997 Commits

Author SHA1 Message Date
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
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
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
Bård Skaflestad
9af7166eee Merge pull request #149 from rolk/149_projstruct
Harmonize project structure to maximize build code reuse
2013-02-22 04:07:10 -08:00
Roland Kaufmann
6234ca50fa Use generic name for configure wrapper also 2013-02-22 11:21:58 +01:00
Bård Skaflestad
9f0f834e73 Merge pull request #160 from akva2/redhat_packaging
added: spec file for redhat packaging
2013-02-22 02:17:48 -08:00
Roland Kaufmann
ad2a604026 Use generic names in other files also
Reduce the number of files that must be customized when starting new
projects.
2013-02-22 11:08:57 +01:00
Roland Kaufmann
d818034537 Distinguish between AGMG and opm-core specific
The AGMG parts may be reusable in other projects
2013-02-22 10:59:06 +01:00
Roland Kaufmann
586ce1d35e Reorder dependency list
Should still be queried in topological order
2013-02-22 10:54:27 +01:00
Roland Kaufmann
f472f2e8ef Replace hardcoded opm-core name with variable 2013-02-22 10:53:10 +01:00
Roland Kaufmann
e7e53cedbf Rearrange options in order of need
Boost is very little likely to be removed from the list of dependencies;
we rather want a continuous block to remove when customizing.
2013-02-22 10:33:22 +01:00
Roland Kaufmann
6e1453a80d Allow --without as an alias to --disable
This gives a symmetry to --with-xxx options
2013-02-22 10:21:18 +01:00
Roland Kaufmann
61289a0e0b Make project file easier to customize
Note where opm-core specific parts are, and put dependency listing to
the top where it is more noticable.
2013-02-22 10:08:50 +01:00
Roland Kaufmann
528a8e42f6 Specify source directory at the highest level
Some projects also have side directories for utilities etc.
2013-02-22 09:58:19 +01:00
Roland Kaufmann
c16864e7a5 Allow more variety in unit test program file names
They can now be called test_*.cpp or *_test.cpp
2013-02-22 09:58:19 +01:00
Roland Kaufmann
77d214be8e Correct mixup between option and cache variables
Options are boolean flags that are stored... in the cache, whereas
cache variables are also stored in the cache, but can have a variety
of types (including booleans). It was possible to confuse the two,
because if you set it as a variable on the command line, it will
override both.
2013-02-22 09:58:19 +01:00
Roland Kaufmann
dfc9f70ee0 Consider directory itself to be part of datafiles
Previously the directory name was just entered as part of a glob; the
new version uses the satellite name as a directory and also makes sure
that this directory is available to run tests in, even if there are no
datafiles (the directory itself is now considered a datafile)
2013-02-22 09:58:18 +01:00
Roland Kaufmann
67e69c811f Only copy Doxygen stylesheet if it actually exists 2013-02-22 09:58:18 +01:00
Roland Kaufmann
192e4595a5 Rename docu_dir -> doxy_dir to reflect its purpose 2013-02-22 09:58:18 +01:00
Arne Morten Kvarving
10f2c61b10 added: spec file for redhat packaging 2013-02-21 18:57:55 +01:00
Roland Kaufmann
5dc58db0dd Describe how to get extra packages from OPM repo 2013-02-21 13:11:29 +01:00