OilfieldToolsNet/opm-core
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
2,958 Commits 9 Branches 35 Tags 15 MiB
9af7166eee
Commit Graph

2958 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
5810819b95 Allow some template files to keep their Autotools dirs 
By using the abs_top_{build,src}dir variables, template files can
co-exist between Autotools and CMake build systems.
 2013-02-21 10:24:21 +01:00
Roland Kaufmann
041f3fb881 Use variables available from project to specify paths 2013-02-21 10:24:21 +01:00
Roland Kaufmann
8a5de432e8 Split Doxyfile into a template and a customization part 
Most of the file is not changed from some sensible default anyway, so we
can store this in the template directory and have a much more manageable
local file which just contains the relevant changes.
 2013-02-21 10:24:21 +01:00
Roland Kaufmann
cc3987d090 Allow for a project to not have any test cases 2013-02-21 10:24:21 +01:00
Bård Skaflestad
b7cf79ef56 Merge pull request #157 from rolk/157_confopts 
Provide a similar list of options to probes as is given to code
 2013-02-21 01:18:56 -08:00
Roland Kaufmann
01fc743d41 Only write message if operation actually performed 
Wording of the message was so that one could believe that a libtool
archive had been written even though it had not.
 2013-02-20 23:55:26 +01:00
Roland Kaufmann
0db4d63bb0 Provide all config vars to test probes systematically 
Generate a list of compiler options that does the defines in the same
manner that it would for config.h
 2013-02-20 23:49:04 +01:00
Bård Skaflestad
5e6806a1de Merge pull request #156 from rolk/156_docdir 
Allow documentation to be installed in a directory with customized name
 2013-02-20 08:44:16 -08:00
Roland Kaufmann
bf92600595 Enable customization of class doc. dir. name 
Distributions have various conventions for this, so the package must
be able to tell where it wants the class doc. to be put for the
`install` target.
 2013-02-20 14:36:27 +01:00
Bård Skaflestad
42e1fc6d10 Merge pull request #155 from rolk/153_datafiles 
Make `make test` work on release builds
 2013-02-20 05:20:57 -08:00
Roland Kaufmann
e1488bbca7 Fix dependencies between test programs and datafiles 
Apparently, DEPENDS can only be used between file-level dependencies
and not target-level dependencies. add_dependencies must be used for
that.
 2013-02-20 14:07:29 +01:00
Roland Kaufmann
fa01a6fed1 Change directory with test driver for older CMakes 
The WORKING_DIRECTORY property wasn't added until 2.8.4; for versions
earlier than that we provide a work-around. On newer versions we set the
property since some other components may use it.
 2013-02-20 10:33:29 +01:00
Roland Kaufmann
ebc0be26aa Make sure that datafiles are copied when tests are made 
That way, if someone runs `make test`, the datafiles will be there if
the testing programs are there, and the tests won't fail (because of
that).
 2013-02-19 23:28:44 +01:00
Roland Kaufmann
abf418f2bd Use provided filenames instead of hardcoded list 2013-02-19 23:04:37 +01:00
Roland Kaufmann
b53e39ada5 Remove copied data files on distclean 2013-02-19 23:00:01 +01:00
Roland Kaufmann
7b046ce5a8 Quote output correctly 2013-02-19 22:58:35 +01:00
Bård Skaflestad
661d3624a8 Merge pull request #150 from rolk/150_underlink 
Link issues in release/2013.03 branch on CentOS 5.9
 2013-02-19 04:47:15 -08:00
Roland Kaufmann
9328cb896e Protect against underlinking of UMFPACK library 
If libumfpack.so does not declare an explicit dependency on libamd.so,
the linker option -Wl,--as-needed will cause an undefined reference
since we don't use libamd.so ourself. If the configuration determines
that this may be the case, a linker option that forces linking the the
AMD library is added for the SuiteSparse library, and the general
configuration then gets out of the way if this is set.
 2013-02-19 13:15:00 +01:00
Atgeirr Flø Rasmussen
776f55ca68 Merge pull request #145 from rolk/0145_centos 
Make opm-core tests compile on CentOS 6.3
 2013-02-17 16:33:07 -08:00
Roland Kaufmann
be7ad261d5 Probe various candidates for system release info 
Not all Linux distributions is LSB-compliant, notably RHEL 6, so we
should make an effort to check various known other files in order to
identify the distribution.
 2013-02-15 13:58:49 +01:00
Roland Kaufmann
be26e078d2 Allow CMake program to be specified with env. var. 
If you are using a custom CMake, you should be able to set the
environment variable "CMAKE" and have the configure script pick up
the default from there so that you don't have to specify the option
every time.
 2013-02-15 13:51:53 +01:00
Roland Kaufmann
4fc2593bb3 Prevent conflict between older Boost and newer CMake 
The probe for Boost was changed in CMake 2.8; if the system has
installed configuration files tailored for an older CMake, the
library paths are not setup correctly. This patch disables using
those configuration files; just use the library directly instead.
 2013-02-15 13:51:53 +01:00
Roland Kaufmann
ad5d4847c2 Look for CMake 2.8 if available on system 
We require at least this version, and if there is a newer, it will
probably break due to lack of backward compatibility anyway.
 2013-02-15 13:51:52 +01:00
Roland Kaufmann
027407e50b Use TinyXML instead of LibXML2 
The code only uses TinyXML, so the list of dependencies was wrong,
something that was covered by the bundled version of TinyXML.
 2013-02-15 13:51:52 +01:00
Roland Kaufmann
4519ccb474 Provide instr. for installing deps. on CentOS 
Currently these doesn't include packages for SuperLU and DUNE since they
are not part of EPEL and must be provided on their own.
 2013-02-15 13:51:52 +01:00
Roland Kaufmann
b412acb448 Don't remove original files from in-source trees 
If we are building in-source, some files are not copied because they
would end up being the same, e.g. GNUmakefile.
 2013-02-15 13:51:52 +01:00
Roland Kaufmann
cbd78d9cc2 Allow user to specify another version of CMake 
On CentOS, cmake28 must be used rather than the standard cmake
 2013-02-15 13:51:52 +01:00
Roland Kaufmann
9320faaf83 Correct typo which made distclean target malfunction 
Probably typed _DIRECTORY instead of _DIR since there were other
variables nearby with that suffix.
 2013-02-15 13:51:52 +01:00
Atgeirr Flø Rasmussen
0af4c3bbca Merge pull request #146 from rolk/0146_testing_dep 
Remove dependency on Boost.Test from main library
 2013-02-15 01:31:15 -08:00
Atgeirr Flø Rasmussen
82fa76c325 Merge pull request #147 from rolk/0147_cmake_ver 
Print OS and CMake versions to configuration log
 2013-02-15 01:25:00 -08:00
Roland Kaufmann
b2520ab9cb Print CMake and OS version info to configuration log 
Instead of asking the user which distribution it is, this will now be
visible from the log (which is included when uploading CTest runs)
 2013-02-15 10:13:14 +01:00
Roland Kaufmann
c423fc7a86 Move version information together with other headers 2013-02-15 09:57:45 +01:00
Roland Kaufmann
8948f02746 Remove dependency on Boost.Test from main library 
The unit tests are not bundled with the runtime, so it is an unnecessary
dependency. (It is still of course a dependency for the development
package).
 2013-02-15 09:39:53 +01:00