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

155 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Joakim Hove
4cf9bea747 Added warning suppression macros from core/parser. 2015-10-04 17:14:33 +02:00
Joakim Hove
8608a27215 Merge pull request #50 from bska/fix-variable-reference 
Reference correct variable in source-file auto-detection
 2015-10-01 14:00:37 +02:00
Bård Skaflestad
7f6d6ec256 Reference correct variable in source-file auto-detection 
Commit f638ee8 contained a last-minute, untested change that caused
downstream build failures.  Reference the correct variable,

    PROJECT_SOURCE_DIR

in place of the non-existent CMAKE_PROJECT_SOURCE_DIR.

Pointy hat: Bard.Skaflestad@sintef.no
 2015-10-01 13:46:29 +02:00
Andreas Lauser
e83cec750b Merge pull request #49 from bska/test-auto-source-fullpath 
Use full path to auto-detected sources
 2015-10-01 13:35:49 +02:00
Bård Skaflestad
f638ee8a15 Use full path to auto-detected sources 
This is a work-around for an issue that presented when switching
module opm-material's test framework to using the opm_add_test macro
with automatically detected sources.  The macro would not find any
source files and subsequently end up effectively calling

    add_executable("${CURTEST_EXE_NAME}")

which promts CMake to respond with "incorrect number of parameters".

There may be other, more fundamental, problems here, but this does
at least restore the build of module opm-material on the Jenkins CI
system.
 2015-10-01 13:29:23 +02:00
Arne Morten Kvarving
06ba27ff04 Merge pull request #47 from joakim-hove/find-opm-data 
Added Findopm-data module.
 2015-09-22 14:10:29 +02:00
Joakim Hove
75b1d1fb41 Added Findopm-data module. 2015-09-22 13:46:15 +02:00
dr-robertk
08c05c8bae Merge pull request #45 from akva2/fix_config_files 
fixed: we need different paths in installed and in-tree config file
 2015-09-21 15:57:42 +02:00
Arne Morten Kvarving
0b321d31ef fixed: we need different paths in installed and in-tree config file 
fixes #44
 2015-09-21 14:21:21 +02:00
Arne Morten Kvarving
8cd76e6d9e Merge pull request #43 from dr-robertk/PR/fix-build-without-mpi 
FindParMETIS: when USE_MPI is OFF the FindParMETIS check should not called.
 2015-09-21 13:51:30 +02:00
Robert Kloefkorn
6508cc2721 FindParMETIS: when USE_MPI is OFF the FindParMETIS check should not be called. 
Otherwise the opm-core module might not build.
 2015-09-21 13:50:12 +02:00
Atgeirr Flø Rasmussen
a584fd795f Merge pull request #41 from akva2/fix_sibling_builds 
changed: remove REQUIRED from opm-common
 2015-09-16 16:21:18 +02:00
Arne Morten Kvarving
9d96a114f7 changed: remove REQUIRED from opm-common until it supplies headers/libraries 
a module requires at least headers to be marked as found by the macros
 2015-09-16 14:31:29 +02:00
Atgeirr Flø Rasmussen
d141a15524 Merge pull request #38 from akva2/fix_install_mode 
Fix install mode
 2015-09-14 08:19:20 +02:00
Arne Morten Kvarving
08b73d1738 Merge pull request #39 from dr-robertk/PR/fix-parmetis-metis-dependency 
Fix parmetis - metis dependency.
 2015-09-10 14:48:48 +02:00
Robert Kloefkorn
0931ee5a08 [ParMETIS] fix metis dependency. 2015-09-10 14:44:49 +02:00
Arne Morten Kvarving
aefbe0bf17 fixed: install cmake macros 2015-09-09 16:23:37 +02:00
Arne Morten Kvarving
9df2e0adc9 fixed: properly generate config file for opm-common 2015-09-09 16:23:26 +02:00
Atgeirr Flø Rasmussen
6e3301d429 Merge pull request #35 from akva2/rename_common 
changed: rename to opm-common
 2015-09-09 11:36:34 +02:00
Arne Morten Kvarving
5336b3a3e6 Merge pull request #2 from babrodtk/akva2-rename_common 
Removed buggy REQUIRED statements for opm-common
 2015-09-09 10:04:34 +02:00
babrodtk
9e52bd66e8 Removed buggy REQUIRED statements for opm-common 2015-09-08 21:55:13 +02:00
Andreas Lauser
ce26a7cbb6 add a hack to the configure script so that it specifies --with-opm-common for itself 
this is only needed within the opm-common module.
 2015-09-08 15:11:06 +02:00
Andreas Lauser
6b04430699 replace the stub configure script by a proper version 
this was copied from opm-core.
 2015-09-08 15:11:06 +02:00
Andreas Lauser
209f8e15d7 rename the remaining occurences of "opm-cmake" to "opm-common" 2015-09-08 15:11:06 +02:00
Andreas Lauser
8e13912b2b add CMakeLists.txt and CMakeLists_files.cmake and remove dummy Makefile 
as for the patch before, this will only strictly required once c++
code is added to the repo.
 2015-09-08 14:34:59 +02:00
Andreas Lauser
76f9bdcd9f add CMake Find module for opm-common 
this is not yet required, but it will be as soon as c++ code is added
to the repo.
 2015-09-08 10:42:46 +02:00
Arne Morten Kvarving
ea3126feb4 changed: rename to opm-common 2015-09-08 10:14:00 +02:00
Arne Morten Kvarving
a3c1c00f80 Merge pull request #34 from blattms/atgeirr-fixes-findparmetis 
Atgeirr's and my fixes findparmetis/pt-scotch
 2015-08-31 11:40:22 +02:00
Markus Blatt
74767da544 Remove Duneism of global ALL_PKG_FLAGS. 
It is not needed for OPM.
 2015-08-25 18:06:00 +02:00
Markus Blatt
4a14e8d5cd [cmake] Add more search paths to find_path with NO_DEFAULT_PATH. 
When specifying NO_DEFAULT_PATH, we have to specify include and lib
manually to find the headers and libraries. This commit does this
for FindParMETIS and FindPTScotch
 2015-08-25 18:06:00 +02:00
Atgeirr Flø Rasmussen
8ffda9d4f2 Added Scotch library to PT-Scotch libraries list. 2015-08-25 18:00:28 +02:00
Markus Blatt
de76663211 Prevents (PAR)METIS_INCLUDE_DIR-NOTFOUND variables in the include directories. 
Previously we added (PAR)METIS_INCLUDE_DIRS to CMAKE_REQUIRED_INCLUDES
even if these directories were not found and set to
(PAR)METIS_INCLUDE_DIR-NOTFOUND. Now we test whether they are found and only
use them in this case.
 2015-08-25 18:00:27 +02:00
Markus Blatt
4ece0532a2 Removes debugging output. 2015-08-25 18:00:12 +02:00
Andreas Lauser
ba17a1591c Merge pull request #33 from dr-robertk/PR/ewoms-can-use-dune-fem 
Make ewoms find dune-fem.
 2015-08-05 20:42:48 +02:00
Robert Kloefkorn
70e4c0c4d3 Make ewoms find dune-fem. 2015-08-05 18:21:30 +02:00
Arne Morten Kvarving
2596ad7d3c Merge pull request #31 from joakim-hove/find-ert-python 
Changed code for finding ERT Python
 2015-08-04 13:06:54 +02:00
Joakim Hove
27b22341d9 Changed code for finding ERT Python 
- Using standard python 'import ert' and introspection.
 - Using dist-packages (debian) and site-packages (!debian).
 - In separate cmake module FindERTPython.cmake
 2015-08-04 13:04:43 +02:00
Arne Morten Kvarving
05bf882dba Merge pull request #28 from andlaus/define_HAVE_TYPE_TRAITS 
opm-material: add HAVE_TYPE_TRAITS to config.h
 2015-08-04 11:39:44 +02:00
Arne Morten Kvarving
4db28ac9e0 Merge pull request #30 from andlaus/parmetis_use_sequential_metis_module 
FindParMETIS: use the FindMETIS module to deal with sequential METIS
 2015-08-04 11:39:20 +02:00
Andreas Lauser
5e30e3a4ab FindParMETIS: use the FindMETIS module to deal with sequential METIS 
for me, 4292de413f lead to linker errors
if the sequential metis library was required (and the parallel is not
installed).  see e.g.,

http://www.opm-project.org/CDash/viewBuildError.php?buildid=41290

The reason for this is a partial clash in the variable names which are
used by both modules. With this PR, the FindParMETIS module does not
write to any variables that are prefixed by "METIS_".
 2015-08-04 11:32:00 +02:00
Arne Morten Kvarving
ae71c89e6c Merge pull request #29 from andlaus/disable_sibling_search_in_configure 
configure wrapper: disable the sibling search
 2015-08-03 13:38:04 +02:00
Andreas Lauser
9644664e03 configure wrapper: disable the sibling search 
if the 'configure' wrapper is used, you will most likely use
dunecontrol. since duncontrol explicitly passes the paths for all the
dependencies, the "convenience" of the sibling search not wanted in
most cases.
 2015-08-03 13:28:16 +02:00
Andreas Lauser
6af5c6070b opm-material: add HAVE_TYPE_TRAITS to config.h 
dune has a compatibility layer for std::conditional and some versions
of it emit a deprecation warning if the HAVE_TYPE_TRAITS macro is
undefined:

http://opm-project.org/CDash/viewBuildError.php?type=1&buildid=41175
 2015-07-29 14:14:25 +02:00
Arne Morten Kvarving
6ddc6c077b Merge pull request #27 from andlaus/opm-core_requires_opm-material 
add opm-material to the prerequisites of opm-core
 2015-07-28 18:23:44 +02:00
Andreas Lauser
6a3309e27d add opm-material to the prerequisites of opm-core 2015-07-28 17:26:22 +02:00
Arne Morten Kvarving
4292de413f Merge pull request #26 from blattms/add-parmetis-module 
Addes a module for finding ParMETIS or the ParMETIS interface of Scotch
 2015-07-24 15:39:52 +02:00
Markus Blatt
191e8994be Addes a module for finding ParMETIS or the ParMETIS interface of PT-Scotch. 
The AMG within dune-istl issues a warning if ParMETIS is not available.
The reason is that it uses ParMETIS or the ParMETIS bindings of PT-Scotch
to redistribute the load on the coarse levels. Even with an installed and
found PT-Scotch we need to adapt the include path and the libraries linked
to make it work.

Therefore this commit adds a module for searching for ParMETIS and activates
it whenever dune-istl is a dependency. With this the warning about missing
ParMETIS for flow_cp vanishes.
 2015-07-24 15:30:17 +02:00
Arne Morten Kvarving
5c7ea4a2eb Merge pull request #25 from akva2/add_ert_python 
Look for python module in ERT
 2015-07-15 15:37:03 +02:00
Arne Morten Kvarving
cfd0fa55cb added: look for python module in ERT 2015-07-15 15:00:23 +02:00
Arne Morten Kvarving
afcf0d2917 changed: declare check target before calling test hook 
in order for test hook to be able to add dependencies to the target
 2015-07-15 15:00:16 +02:00