OilfieldToolsNet/opm-common
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
772 Commits 18 Branches 75 Tags 73 MiB
53e4217c27
Commit Graph

772 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Markus Blatt
4a46e4a4cd Only set the library directories if module builds a library. 2017-11-08 14:58:38 +01:00
Arne Morten Kvarving
d0c1eb28e3
Merge pull request #281 from andlaus/opm-simulators_no_umfpack_required 
don't mark UMFpack as required for opm-simulators
 2017-10-30 11:05:32 +01:00
Andreas Lauser
b6aa59aa66 Merge pull request #282 from atgeirr/minor-buildsys-fixes 
Minor buildsystem fixes
 2017-10-27 17:44:25 +02:00
Atgeirr Flø Rasmussen
1709398e25 Remove RT lib dependency. 2017-10-27 10:09:25 +02:00
Atgeirr Flø Rasmussen
de70cdcb52 Library not needed nor found on macOS. 2017-10-26 11:08:10 +02:00
Atgeirr Flø Rasmussen
5519643aa4 Always set include-related CMake variables. 2017-10-26 10:51:18 +02:00
Andreas Lauser
fe7938d82a don't mark UMFpack as required for opm-simulators 
before OPM/opm-simulators#1309 it was required, but this was not
enforced by the build system because the SuiteSparse tests are run by
the opm-core build system first and UMFpack is optional there.

thanks to [at]akva2 and [at]blattms for the heads-up.
 2017-10-25 16:48:33 +02:00
Atgeirr Flø Rasmussen
1554574728 Merge pull request #280 from akva2/update_rh_packaging 
update redhat packaging
 2017-10-25 13:06:13 +02:00
Arne Morten Kvarving
5667a4877a update redhat packaging 2017-10-25 09:37:22 +02:00
Arne Morten Kvarving
339d003a38 Merge pull request #276 from blattms/cmakify-dune-version 
[cleanup] Use the module version that CMake exports directly.
 2017-10-23 14:51:31 +02:00
Markus Blatt
8e58ea8567 Print package version and origin only for found modules. 2017-10-20 12:37:34 +02:00
Markus Blatt
c030dd865c Use module_DIR as the location in found status message. 2017-10-20 12:36:51 +02:00
Markus Blatt
63dd29ceb0 Use the module version that CMake exports directly. 
Since all supported DUNE versions have a CMake based build system,
when can drop the magic and use the module version exported by CMake
directly.

The magic used previously was broken when setting CMAKE_INSTALL_LIBDIR to
an absolute path.
 2017-10-20 12:31:17 +02:00
Andreas Lauser
683bca9131 change version to 2018.04-pre 2017-10-19 19:30:30 +02:00
Andreas Lauser
ef0b41419e Merge pull request #279 from akva2/remove_stale_file 
remove stale file
 2017-10-19 19:24:23 +02:00
Arne Morten Kvarving
f8cac9cf3f remove stale file 2017-10-19 13:46:01 +02:00
Atgeirr Flø Rasmussen
c784931db8 Merge pull request #278 from GitPaean/require_umfpack_opm_simulators 
[discussion] adding UMFpack to prerequisite of opm-simulators
 2017-10-17 07:02:45 +02:00
Kai Bao
e7b1172528 adding UMFpack to prerequisite of opm-simulators 2017-10-16 21:17:28 +02:00
Arne Morten Kvarving
e1f7da13d2 Merge pull request #273 from blattms/cmakify-sibling-search 
Simplify dune/opm module search by relying on cmake package config files
 2017-10-16 20:02:27 +02:00
Markus Blatt
6715ed6d48 Allow multiple find_package calls in config mode 2017-10-13 21:35:24 +02:00
Markus Blatt
5662f2a188 Allow second search for opm-common to get all its dependencies and defines. 
As opm-common is search in the toplevel CMakeLists.txt of each module in
config mode and the dependencies and defines are only processed in
opm_find_package(opm-common), we allow a second search using module mode
to trigger opm_find_package.
 2017-10-13 21:20:30 +02:00
Markus Blatt
db0a52ffdb Force module mode in search for dune and opm even if *_DIR is set. 
Otherwise some defines and macros will not be set as this is done
in opm_find_package. This might also make sense for dunecontrol
which always will set *_DIR.
 2017-10-13 21:19:11 +02:00
Markus Blatt
c7fc21e343 Stop setting COMPARE_(SUMMARY|ECL)_COMAND in Findopm-output.cmake. 
Theses variables are already set in opm-output-config.cmake. Unfortunately,
theres is still a bug there which will be fixed by a PR in opm-output. After
that everything should work and have less guess work in it.
 2017-10-11 14:37:21 +02:00
Markus Blatt
7a891baef7 Use correct default clone directory in sibling search for ecl. 
Previously we assumed it to be ecl (like the project name).
That is not correct. With this commit we now use the correct
default clone directory, libecl, in the sibling search.
 2017-10-10 12:44:22 +02:00
Markus Blatt
fc4bac6b7a Suppress message "finding .. using module mode" for OPM modules. 2017-10-10 12:42:49 +02:00
Arne Morten Kvarving
352b5a371d Merge pull request #275 from akva2/fix_message 
fix message posted on repeated update_data calls
 2017-10-09 12:51:21 +02:00
Arne Morten Kvarving
2edffb8e61 fix message posted on repeated update_data calls 2017-10-09 12:40:14 +02:00
Atgeirr Flø Rasmussen
29d3df8e58 Merge pull request #274 from akva2/no_new_pr 
changed: do not open a new PR in repeated update-data calls
 2017-10-09 12:15:01 +02:00
Arne Morten Kvarving
2c74f75231 changed: do not open a new PR in repeated update-data calls 2017-10-09 11:10:46 +02:00
Markus Blatt
7c779697c7 Deactivate package cache and activate sibling search for ecl. 
Even though people are telling that ecl is already found using
sibling search it turned out that this statement is false. It
was always found using the CMake package cache. When installing
this lead to the installed package using ecl from the build tree.
With this commit we first try to find ecl without the package cache
but maybe using sibling search. Building installed packages no works
by setting -DSIBLING_SEARCH=Off -DCMAKE_INSTALL_PREFIX=/install/path
 2017-10-06 22:36:40 +02:00
Arne Morten Kvarving
e6e5491c74 add HAVE_SUITESPARSE_UMFPACK to opm-simulators config.h 2017-09-29 23:19:48 +02:00
Arne Morten Kvarving
48472bcf1a typo: SUITEPARSE -> SUITESPARSE 2017-09-29 21:13:10 +02:00
Arne Morten Kvarving
fd411cb1b7 Merge pull request #259 from blattms/fix-check-for-opm-grid-with-dune-2.5 
Fix check for opm grid with dune 2.5
 2017-09-29 20:21:40 +02:00
Markus Blatt
38e198d961 Always append CONFIG_VARS to ${module}_CONFIG_VARS. 
It seems like this variable was not empty for e.g. dune-grid
and therefore we did not add some necessary defines before this
commit.
 2017-09-29 11:02:14 +02:00
Arne Morten Kvarving
3283278090 Merge pull request #265 from akva2/add_another_alias 
add another alias for UMFPACK
 2017-09-27 08:44:06 +02:00
Bård Skaflestad
151e6e55e4 Merge pull request #272 from akva2/update_fdapps_prereqs 
changed: update opm-flowdiagnostics-applications prereqs
 2017-09-26 17:23:04 +02:00
Markus Blatt
f5bf291f7d Simplify dune/opm module search by relying on cmake package configuration files. 
We use ${module}_DIR to set the correct path when sibling search is activated.
The package configuration files set all the necessary variable and we save
us a lot of CMake magic.
 2017-09-26 16:49:18 +02:00
Arne Morten Kvarving
9646753a10 changed: update opm-flowdiagnostics-applications prereqs 
it is now ecl, not ERT
 2017-09-26 13:48:03 +02:00
Atgeirr Flø Rasmussen
9ca5b7d37b Merge pull request #271 from akva2/prune_old_branches 
added: prune old branches from jenkins4opm remote on update_data calls
 2017-09-26 10:34:32 +02:00
Arne Morten Kvarving
73d978d6c5 added: prune old branches from jenkins4opm remote on update_data calls 2017-09-26 09:48:15 +02:00
Arne Morten Kvarving
0ea57b9054 Merge pull request #268 from andlaus/compile-ONLY_COMPILE 
also compile tests marked `ONLY_COMPILE` on `make test-suite`
 2017-09-22 11:46:16 +02:00
Atgeirr Flø Rasmussen
2f872e82b3 Merge pull request #269 from akva2/optional_petsc 
add option to enable PETSc
 2017-09-10 16:16:59 +02:00
Arne Morten Kvarving
8c9776688d add option to enable PETSc 
disabled by default
 2017-09-10 06:18:48 +02:00
Andreas Lauser
4b60de7248 also compile tests marked ONLY_COMPILE on make test-suite 2017-09-03 17:44:22 +02:00
Atgeirr Flø Rasmussen
67a8d5b553 Merge pull request #266 from akva2/slu_stuff 
changed: add option to disable superlu
 2017-08-22 09:32:50 +02:00
Arne Morten Kvarving
e3ff47dd9f changed: add option to disable superlu 
make this default to off.

additionally, check that the found superlu version
is compatible with the dune-istl version in use.
in particular superlu5 is not compatible with dune-istl 2.4
 2017-08-21 16:49:47 +02:00
Arne Morten Kvarving
0a9bae6587 add another alias for UMFPACK 
used by dune 2.5
 2017-08-16 12:25:20 +02:00
Atgeirr Flø Rasmussen
15aba45d53 Merge pull request #260 from nairr/term_output 
Message formatting edit
 2017-08-01 11:22:50 +02:00
Rohith Nair
da654bde90 Modified tests 2017-07-31 15:39:31 +02:00
Joakim Hove
19aaeff10a Merge pull request #262 from andlaus/travis_dune-2.4.2 
travis: switch from dune 2.3.1 to dune 2.4.1
 2017-07-19 08:05:14 +02:00