Commit Graph

127 Commits

Author SHA1 Message Date
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
dr-robertk
66d6d11bfd Merge pull request #61 from atgeirr/bump-version
Bump version and unify format of dune.module.
2015-10-23 15:06:44 +02: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
9265a695ea Bump version and unify format of dune.module. 2015-10-23 13:18:47 +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
Joakim Hove
531681363b Merge pull request #59 from atgeirr/remove-realpath
Do not use REALPATH for OPM_DATA_ROOT.
2015-10-22 08:56:50 +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
Atgeirr Flø Rasmussen
ccc1e5c71f Update README.md 2015-10-21 11:00:30 +02:00
Atgeirr Flø Rasmussen
77d83de695 Merge pull request #57 from akva2/add_redhat_packaging
add redhat packaging
2015-10-20 18:31:14 +02:00
Arne Morten Kvarving
d57a811f0c add redhat packaging
rhel6/rhel7 is supported
2015-10-20 15:41:58 +02:00
Atgeirr Flø Rasmussen
7cb6484a97 Merge pull request #56 from akva2/add_debian_packaging
added: debian packaging
2015-10-20 10:11:06 +02:00
Arne Morten Kvarving
b55059ac1a added: debian packaging 2015-10-20 10:07:25 +02:00
Atgeirr Flø Rasmussen
d8cd06f29d Merge pull request #55 from andlaus/error_macros_to_opm_common
add the error macros from opm-core
2015-10-12 13:30:18 +02:00
Andreas Lauser
4a3e1a2fd9 add the error macros from opm-core
i.e., OPM_THROW(exception, message) and some excption classes
2015-10-08 12:13:19 +02:00
Joakim Hove
295c848e54 Merge pull request #54 from akva2/fix_multiple_finds
fixed: also check lower-case module variable
2015-10-07 22:48:20 +02:00
Arne Morten Kvarving
f2c14be3be fixed: also check lower-case module variable 2015-10-07 12:59:45 +02:00
Joakim Hove
4c124c54b4 Merge pull request #52 from joakim-hove/opm-common-required
opm-common is REQUIRED
2015-10-06 16:06:23 +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
Atgeirr Flø Rasmussen
97c6d9e8ba Merge pull request #51 from joakim-hove/add-warning-suppression
Move warning suppression header
2015-10-06 08:28:14 +02:00
Joakim Hove
e99d3b811e Findopm-common : find warning suppression header. 2015-10-04 17:36:08 +02:00
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