From 1e8aecf36c3db4bca288de3f84dd5dcab0c29db2 Mon Sep 17 00:00:00 2001 From: Roland Kaufmann Date: Wed, 14 Aug 2013 13:37:37 +0200 Subject: [PATCH] Publicly depend on version of dune-grid The interface of the class PersistentContainer changed between DUNE 2.2 and DUNE 2.3 in an incompatible way, so we need to present different versions of the class depending on the version of DUNE linked with. This changeset adds the version variables for dune-grid to the list of publicly necessary #defines that must go into using dune-cornerpoint. Notice that this will cause the definition of DUNE_GRID_VERSION_XXX to be added to the flags list of dune-cornerpoint. This can be seen as either a bug or a feature. If you try to link first dune-cornerpoint to one version and then to another version of DUNE later, there is a very good chance that you'll end up with problems anyway. --- cmake/Modules/dune-cornerpoint-prereqs.cmake | 3 +++ 1 file changed, 3 insertions(+) diff --git a/cmake/Modules/dune-cornerpoint-prereqs.cmake b/cmake/Modules/dune-cornerpoint-prereqs.cmake index 1d9b05d7..ce1e001d 100644 --- a/cmake/Modules/dune-cornerpoint-prereqs.cmake +++ b/cmake/Modules/dune-cornerpoint-prereqs.cmake @@ -4,6 +4,9 @@ # defines that must be present in config.h for our headers set (dune-cornerpoint_CONFIG_VAR HAVE_DYNAMIC_BOOST_TEST + DUNE_GRID_VERSION_MAJOR + DUNE_GRID_VERSION_MINOR + DUNE_GRID_VERSION_REVISION ) # dependencies