Commit Graph

130 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
d9696c7ea4 Modularize default build settings 2013-02-11 23:08:28 +01:00
Roland Kaufmann
42cab79feb Modularize location of source files 2013-02-11 23:08:28 +01:00
Roland Kaufmann
7bfa115fb3 Modularize compilation of main library 2013-02-11 23:08:28 +01:00
Roland Kaufmann
293ea97fa9 Modularize installation target 2013-02-11 23:08:28 +01:00
Roland Kaufmann
e4e9c1cfaa Modularize documentation 2013-02-11 23:08:28 +01:00
Roland Kaufmann
d2e5361c35 Modularize dist-clean target 2013-02-11 23:08:28 +01:00
Atgeirr Flø Rasmussen
c58b4684b3 Use more functions in testing found umfpack
The HAVE_UMFPACK_WITHOUT_CHOLMOD test would generate a false success.
New test contains program with more calls to the umfpack API, reflecting
our actual usage.
2013-02-11 23:08:28 +01:00
Roland Kaufmann
79f64d2c16 Be more flexible about version number quoting
Some versions of libtool write quotes around the version number, some
do not; we must handle both cases.
2013-02-11 23:08:28 +01:00
Roland Kaufmann
ae6e5314e3 Remove hardcoded project names and directories
Everything is now set through variables, which means that we can
change the name of the project by just altering the header.
2013-02-11 23:08:28 +01:00
Roland Kaufmann
99f2a6e55f Output the name of the libtool archive generated
Enables us to take of this file in a custom clean rule.
2013-02-11 23:08:27 +01:00
Roland Kaufmann
d6b245f549 Explicitly specify language for precompiled headers
This will hopefully guide some (buggy) compiler variants to not start
interpreting the header as a full program, or at least give a more
sensible error message.
2013-02-11 23:08:27 +01:00
Roland Kaufmann
097068f9c1 Move now generic templates into cmake/ directory
Templates can now be reused across projects. The output files are still
put in the root of the output tree because that is where the client
programs will look for them.
2013-02-11 23:06:39 +01:00