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
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
642a0a71fc
Strict option checking unless otherwise specified
...
Having option checking catches typos. Disabling the checking enable us
to use the same build options for a bunch of packages even though they
may not have the same dependencies.
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
12dfe529ff
Don't distinguish between target and project variables
...
Since the project is only building one main target, the library, and
the other targets are just auxiliaries, then the distinction becomes
confusing and unnecessary.
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
39dd997dc1
Clean extra files that has been added to configure
2013-02-11 23:08:27 +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
9020ef64e3
Only start parallel make if user hasn't already
...
The -j flag should only be submitted once. If we are enclosed by yet
another layer of makes, then it will have setup everything for this
sub-make to take part in the job pool.
2013-02-11 23:08:27 +01:00
Roland Kaufmann
4bf313d421
Run original make also for diagnostics
...
If you run make with -n switch, it would just print the forwarding
command. Now it should continue into the original make, having that
one printing its actions as well.
2013-02-11 23:08:27 +01:00
Roland Kaufmann
4d00754e01
Move stylesheets into Documentation/ folder
...
The Doxyfile is still in the root directory because this is more like
a configuration file, and also its presence will be a cue to some
users that Doxygen is possible to run on the project.
2013-02-11 23:08:27 +01:00
Roland Kaufmann
75c92fd91e
Move old pkgconfig file back to be in sync with master
2013-02-11 23:08:09 +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
Roland Kaufmann
f883d52f0f
Make template instantiatable for multiple projects
...
The name "opm-project" is replaced by the real name of the project.
2013-02-11 23:06:39 +01:00
Roland Kaufmann
5c5a1e5c10
Don't hardcode the library name in templates
2013-02-11 23:06:39 +01:00
Roland Kaufmann
2f20314ffb
Pick up description from one place
2013-02-11 23:06:39 +01:00
Roland Kaufmann
66772d4819
Move template to designated cmake/ directory
2013-02-11 23:06:38 +01:00
Roland Kaufmann
5af259f2e1
Report version hash when building
...
This will reduce the number of "which version are you using"-replies
because this can now be found in the log.
2013-02-11 23:06:38 +01:00
