OilfieldToolsNet/opm-common
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #259 from blattms/fix-check-for-opm-grid-with-dune-2.5

Browse Source 
Fix check for opm grid with dune 2.5
This commit is contained in:
Arne Morten Kvarving
2017-09-29 20:21:40 +02:00
committed by GitHub
parent 3283278090 f8841cea15
commit fd411cb1b7
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
cmake/Modules/Findopm-grid.cmake
View File

@@ -20,7 +20,7 @@ find_opm_package (
"${opm-grid_DEPS}"
# header to search for
"dune/grid/CpGrid.hpp"
"dune/grid/cpgrid/GlobalIdMapping.hpp"
# library to search for
"opmgrid"
@@ -29,9 +29,9 @@ find_opm_package (
"HAVE_OPM_GRID"
# test program
"#include <dune/grid/CpGrid.hpp>
"#include <dune/grid/cpgrid/GlobalIdMapping.hpp>
int main (void) {
Dune::CpGrid g;
Dune::cpgrid::GlobalIdMapping g;
return 0;
}
"

3
cmake/Modules/opm-grid-prereqs.cmake
View File

@@ -6,6 +6,9 @@ set (opm-grid_CONFIG_VAR
DUNE_GRID_VERSION_MAJOR
DUNE_GRID_VERSION_MINOR
DUNE_GRID_VERSION_REVISION
DUNE_GEOMETRY_VERSION_MAJOR
DUNE_GEOMETRY_VERSION_MINOR
DUNE_GEOMETRY_VERSION_REVISION
DUNE_COMMON_VERSION_MAJOR
DUNE_COMMON_VERSION_MINOR
DUNE_COMMON_VERSION_REVISION