Commit Graph

2939 Commits

Author SHA1 Message Date
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
Atgeirr Flø Rasmussen
d848dc92f3 Merge pull request #143 from rolk/0143_umfpack
build fails if UMFpack development package is not installed
2013-02-14 00:51:36 -08:00
Roland Kaufmann
456bd8de0b Don't reset list of tutorial programs after filtering
The list of tutorial programs were filtered on whether UMFPACK was
located or not, but then the list was reset to the original again
just before compilation starts.

Also corrected a minor spelling error which caused a similar error.
2013-02-13 21:24:54 +01:00
Atgeirr Flø Rasmussen
80a3bfffbf Merge pull request #144 from rolk/0144_ert_notfound
Configure complains about errors in CMake file if ERT library is not found
2013-02-13 00:46:31 -08:00
Roland Kaufmann
a160847dfb Check for both headers and libs before making test prog
Previously, it was assumed that the project was available if only the
libraries were found (either by full compile, or by package).
2013-02-13 09:30:08 +01:00
Roland Kaufmann
9d56966bab Remove superfluous local variable
The collections have been checked for equal size, we then only need the
size of one of them to iterate. The other boundary pointer is never used
and only generate needless compiler warnings that pollutes the output.
2013-02-12 00:18:24 +01:00
Roland Kaufmann
b53a6bf2df Remove Autotools 2013-02-12 00:18:24 +01:00
Roland Kaufmann
4dbc976cbd Merge branch 'cmake' 2013-02-12 00:18:19 +01:00
Roland Kaufmann
4b24bb3664 Update building instructions for CMake 2013-02-12 00:17:49 +01:00
Bård Skaflestad
7139586a8a Catch up to changing location of ERT headers. 2013-02-11 23:08:29 +01:00
Roland Kaufmann
01a54e9907 Remove debug information put to output tree when distclean 2013-02-11 23:08:29 +01:00
Roland Kaufmann
51a8efa228 Disable precompiled headers for buggy compilers 2013-02-11 23:08:29 +01:00
Roland Kaufmann
be3f3385ad Provide compiler version as a separate macro 2013-02-11 23:08:29 +01:00
Roland Kaufmann
6bbcbd97db Compile examples as well 2013-02-11 23:08:29 +01:00
Roland Kaufmann
dac2b6cf81 Disable tutorials dependent on Umfpack if this is not found 2013-02-11 23:08:29 +01:00
Roland Kaufmann
6d1514d7ca Enumerate all files before we start disabling components 2013-02-11 23:08:29 +01:00
Roland Kaufmann
32b7e527ee Modularize compilation of tests and tutorials 2013-02-11 23:08:29 +01:00
Roland Kaufmann
eaf690f870 Make directory names available through variables as well 2013-02-11 23:08:29 +01:00
Roland Kaufmann
f67a066bdd Modularize copying of test input files 2013-02-11 23:08:28 +01:00
Roland Kaufmann
fc03931356 Rearrange header to get key info first 2013-02-11 23:08:28 +01:00