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

Merge pull request #207 from blattms/fix-multiple-dune-version-request-hickups

Browse Source 
Request dune module versions only in the most upstream opm module.
This commit is contained in:
Andreas Lauser
2016-11-17 17:38:26 +01:00
committed by GitHub
parent ec63c6b7fd 6608bc87e4
commit 8b3a4a6e23
3 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cmake/Modules/opm-core-prereqs.cmake
+3
View File
@@ -8,6 +8,9 @@ set (opm-core_CONFIG_VAR
HAVE_DUNE_ISTL HAVE_DUNE_ISTL
HAVE_MPI HAVE_MPI
HAVE_PETSC HAVE_PETSC
DUNE_ISTL_VERSION_MAJOR
DUNE_ISTL_VERSION_MINOR
DUNE_ISTL_VERSION_REVISION
) )
# dependencies # dependencies
cmake/Modules/opm-grid-prereqs.cmake
-3
View File
@@ -9,9 +9,6 @@ set (opm-grid_CONFIG_VAR
DUNE_COMMON_VERSION_MAJOR DUNE_COMMON_VERSION_MAJOR
DUNE_COMMON_VERSION_MINOR DUNE_COMMON_VERSION_MINOR
DUNE_COMMON_VERSION_REVISION DUNE_COMMON_VERSION_REVISION
DUNE_ISTL_VERSION_MAJOR
DUNE_ISTL_VERSION_MINOR
DUNE_ISTL_VERSION_REVISION
HAVE_ZOLTAN HAVE_ZOLTAN
) )
cmake/Modules/opm-simulators-prereqs.cmake
+3
View File
@@ -5,6 +5,9 @@
set (opm-simulators_CONFIG_VAR set (opm-simulators_CONFIG_VAR
HAVE_OPM_GRID HAVE_OPM_GRID
HAVE_PTHREAD HAVE_PTHREAD
DUNE_ISTL_VERSION_MAJOR
DUNE_ISTL_VERSION_MINOR
DUNE_ISTL_VERSION_REVISION
) )
# dependencies # dependencies