Commit Graph

154 Commits

Author SHA1 Message Date
Atgeirr Flø Rasmussen
9b5d81e358 Rename opm-autodiff -> opm-simulators. 2016-04-08 14:05:26 +02:00
Atgeirr Flø Rasmussen
d789962a93 Rename in comment. 2016-04-06 11:58:36 +02:00
Atgeirr Flø Rasmussen
c2b36fa760 Fix Findopm-grid.cmake module. 2016-04-05 14:54:08 +02:00
Atgeirr Flø Rasmussen
0eae093620 Rename dune-cornerpoint -> opm-grid. 2016-04-04 21:17:57 +02:00
Arne Morten Kvarving
4e537c376f fixed: have the test-suite target depend on the test data file targets 2016-04-04 15:28:57 +02:00
Joakim Hove
98afe9a8a8 Merge pull request #99 from joakim-hove/add-opm-parser-requirement
Add opm-parser requirement.
2016-04-04 12:19:12 +02:00
Bård Skaflestad
1d3db34972 Merge pull request #100 from atgeirr/add-output-to-upscaling
Make opm-output REQUIRED for opm-upscaling.
2016-04-01 10:47:18 +02:00
Atgeirr Flø Rasmussen
5d57af105e Remove warning-generating semicolon. 2016-04-01 08:06:45 +02:00
Atgeirr Flø Rasmussen
87ca6b4764 Switch dependency order. 2016-04-01 08:06:15 +02:00
Atgeirr Flø Rasmussen
7dc2b70aac Revert "opm-material-prereqs.cmake: fix the ordering of the dependencies" 2016-03-31 17:27:30 +02:00
Atgeirr Flø Rasmussen
fe8870bb97 Make opm-output REQUIRED for opm-upscaling. 2016-03-31 17:24:42 +02:00
Joakim Hove
6afeebd717 Add opm-parser requirement. 2016-03-31 16:04:31 +02:00
Andreas Lauser
d48a318401 opm-material-prereqs.cmake: fix the ordering of the dependencies
packages marked REQUIRED must currently preceed optional ones. Also
C99 is not required by opm-material because that module only consists
of c++ code.
2016-03-31 14:50:33 +02:00
Atgeirr Flø Rasmussen
61d3e2011a Merge pull request #92 from joakim-hove/mark-opmcommon-REQUIERED
Mark opm-common as required.
2016-03-31 13:55:24 +02:00
Atgeirr Flø Rasmussen
a75c109c0d Merge pull request #91 from akva2/import_porsol
changed: drop opm-porsol
2016-03-31 13:52:28 +02:00
Atgeirr Flø Rasmussen
dd8af482f2 Merge pull request #89 from kjellkongsvik/opm_autodiff_requires_opm_output
opm-autodiff now dependant on opm-output
2016-03-31 09:42:27 +02:00
Atgeirr Flø Rasmussen
942e90c809 Merge pull request #93 from joakim-hove/add-fPIC
Add global target property: POSITION_INDEPENDENT_CODE
2016-03-29 08:32:59 +02:00
Andreas Lauser
06f4603fd3 ewoms build files: add HAVE_* variables for all dune modules
The main reason for this is that it is good style to add HAVE_FOO
config.h variables for everything which was discovered, but it also
turns out that dune-fem is quite picky about the macros which
expects (and I recently fell on my nose because of this)...
2016-03-22 11:55:01 +01:00
Joakim Hove
07266344bc Set target property POSITION_INDEPENDENT_CODE=True 2016-03-22 11:37:03 +01:00
Joakim Hove
b8f1d2164c Mark opm-common as required. 2016-03-21 22:31:05 +01:00
Arne Morten Kvarving
93a3343b69 changed: drop opm-porsol 2016-03-17 20:11:46 +01:00
chflo
73ad043006 Moved in logfunctionality from opm-parser 2016-03-17 15:23:18 +01:00
Kjell W. Kongsvik
9c825716da opm-autodiff now dependant on opm-output 2016-03-17 14:56:01 +01:00
Kjell W. Kongsvik
855ed76b10 Move OutputWriter to opm-output
Findopm finds opmoutput
2016-03-16 12:42:10 +01:00
Joakim Hove
b032fc0d05 Added cmake files for opm-output. 2016-03-14 13:43:32 +01:00
Markus Blatt
7d3c1e17ba Make opm-core and opm-common a hard requirement.
Previously, cmake succeeded even if opm-core or opm-common was not found.
The cause for this was that dune-cornerpoint was searched for first. As
it was not required it seems like opm-common and opm-core were treated as
optional too.

This commit moves the opm modules to the opm section of the variable and
changes the order of the modules such that modules listed first do not
depend on modules listed afterwards. Now cmake fails if it cannot finy any
of the required modules.
2016-03-07 17:40:23 +01:00
Andreas Lauser
77e7ed97c9 remove the dependency on boost::iostreams if it is not used
as far as I can see, it is not used in any module except opm-upscaling
and it caused the configure stage to fail if I tried to use with a
self-compiled boost 1.60 (which I have to do in order to use clang on
any modern linux distribution.)
2016-02-25 16:40:59 +01:00
Alf Birger Rustad
005b2d2df4 Merge pull request #71 from akva2/fix_sibling_build_thing
fixed: workaround if() bug in cmake
2016-02-08 12:00:35 +01:00
Joakim Hove
05e319b62e Added probe for sibling find of utilxx/include. 2016-02-04 12:40:03 +01:00
Joakim Hove
8b6fb56e84 Simplified FindERT module 2016-02-04 12:40:03 +01:00
Arne Morten Kvarving
531449951d fixed: workaround if() bug in cmake
seems you cannot rely on the NOTFOUND postfix for compound if's
2016-02-03 14:44:53 +01:00
Joakim Hove
10213b025c Merge pull request #66 from joakim-hove/create-lib
Create library in opm-common
2016-02-02 10:06:16 +01:00
Joakim Hove
c8e8be6db9 Added library opm-common with DataContainer. 2016-02-01 10:33:34 +01:00
Robert Kloefkorn
40573e6c57 Finddune-alugrid: switch order of appearance. 2016-01-28 13:42:55 -07:00
Robert Kloefkorn
1269d918a2 Finddune-alugrid: find the package when build with cmake or autotools (libs differ) 2016-01-28 13:27:45 -07:00
Joakim Hove
4b16c76d2d Added opmcommon library in Findopm-common. 2016-01-26 13:29:27 +01:00
Andreas Lauser
9cd4a79b87 hack around CMake policy CMP00054
newer versions of cmake (mine is 3.2.2) complain about policy CMP00054:

```
CMake Warning (dev) at /home/and/src/opm-common/cmake/Modules/ConfigVars.cmake:30 (if):
  Policy CMP0054 is not set: Only interpret if() arguments as variables or
  keywords when unquoted.  Run "cmake --help-policy CMP0054" for policy
  details.  Use the cmake_policy command to set the policy and suppress this
  warning.

  Quoted variables like "FILE" will no longer be dereferenced when the policy
  is set to NEW.  Since the policy is not set the OLD behavior will be used.
Call Stack (most recent call first):
  /home/and/src/opm-common/cmake/Modules/OpmLibMain.cmake:173 (configure_vars)
  CMakeLists.txt:109 (include)
This warning is for project developers.  Use -Wno-dev to suppress it.
```

since I'm pretty sure that the old behaviour was not intended here,
fix this for older versions of cmake as well (by adding a prefix so that
CMake does not interpret "FILE" as a variable.)
2015-11-17 17:36:11 +01:00
Atgeirr Flø Rasmussen
8fefe29e7c Merge pull request #58 from andlaus/fix_alugrid_libs
adapt Finddune-alugrid.cmake to the "paramerge" branch of dune-alugrid
2015-11-09 13:13:41 +01:00
Atgeirr Flø Rasmussen
9a615468c5 Merge pull request #60 from atgeirr/improve-useversion
Improve the UseVersion module.
2015-10-23 13:37:38 +02:00
Atgeirr Flø Rasmussen
6e1efc79af Improve the UseVersion module.
The changes are:
 - Add new macros PROJECT_VERSION_NAME and PROJECT_VERSION_HASH
   in addition to the existing PROJECT_VERSION.
 - Add header include guards.
2015-10-23 10:59:08 +02:00
Atgeirr Flø Rasmussen
e5f0fd70bb Do not use REALPATH for OPM_DATA_ROOT.
This caused trouble when the PROJECT_SOURCE_DIR is a
symlink. When 'b' is a symlink, 'a/b/../' is not the same as 'a',
but that is exactly what REALPATH does. In this case, it means that
the opm-data is found (at ../ relative to the symlink), but the path
that is set does not point to it.
2015-10-21 21:59:45 +02:00
Andreas Lauser
aebc12a227 adapt Finddune-alugrid.cmake to the "paramerge" branch of dune-alugrid 2015-10-21 17:58:58 +02:00
Arne Morten Kvarving
f2c14be3be fixed: also check lower-case module variable 2015-10-07 12:59:45 +02:00
Joakim Hove
242f2d1e92 opm-common is REQUIRED
After moving the headers to enable and disable external warnings to
opm-common, opm-common has become a required dependency for
dune-cornerpoint, opm-autodiff and opm-core.
2015-10-06 12:17:21 +02:00
Joakim Hove
e99d3b811e Findopm-common : find warning suppression header. 2015-10-04 17:36:08 +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
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
Joakim Hove
75b1d1fb41 Added Findopm-data module. 2015-09-22 13:46:15 +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
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