diff --git a/dune/fem-dg/test/advdiff/CMakeLists.txt b/dune/fem-dg/test/advdiff/CMakeLists.txt
index 15cf1ad18b603f1cea475309cfbc568bc321f662..e5878e6291084064d0da2a94b54d1dbd34633be7 100644
--- a/dune/fem-dg/test/advdiff/CMakeLists.txt
+++ b/dune/fem-dg/test/advdiff/CMakeLists.txt
@@ -11,10 +11,20 @@ add_definitions( "-DDIMRANGE=1" )
add_definitions( "-DFLUX=1" )
add_definitions( "-DPRIMALDG" )
-dune_add_test( NAME advdiff
- SOURCES main.cc
- COMPILE_DEFINITIONS POLORDER=2 )
-dune_add_test( NAME advdiffall
- SOURCES main.cc )
+if( DUNE_FEM_DG_VERSION VERSION_LESS "2.4.1" )
+
+ message( STATUS "Using old test build system (${DUNE_FEM_DG_VERSION} 2.4 compability mode) " )
+ add_executable( advdiff main.cc )
+ add_executable( advdiffall main.cc )
+ set_property(TARGET advdiffall APPEND PROPERTY
+ COMPILE_DEFINITIONS "POLORDER=2" )
+ dune_add_test( advdiff advdiffall )
+else()
+ dune_add_test( NAME advdiff
+ SOURCES main.cc
+ COMPILE_DEFINITIONS POLORDER=2 )
+ dune_add_test( NAME advdiffall
+ SOURCES main.cc )
+endif()
add_code_generate_targets( advdiff advdiffall )
diff --git a/dune/fem-dg/test/dataio/CMakeLists.txt b/dune/fem-dg/test/dataio/CMakeLists.txt
index 437e10a7aa077d41a0fe97b5d9cff94fd12d164c..1cb42f54f2a4d45adcb0a557e2761ad0d6c5cf6d 100644
--- a/dune/fem-dg/test/dataio/CMakeLists.txt
+++ b/dune/fem-dg/test/dataio/CMakeLists.txt
@@ -13,10 +13,16 @@ add_definitions( "-DPOLORDER=2" )
add_definitions( "-DDIMRANGE=5" )
add_definitions( "-DENABLE_ADAPTIVELEAFINDEXSET_FOR_YASPGRID" )
-dune_add_test( NAME dataconvert
- SOURCES dataconvert.cc )
-
-dune_add_test( NAME checkpointing
- SOURCES main.cc )
+if( DUNE_FEM_DG_VERSION VERSION_LESS "2.4.1" )
+ message( STATUS "Using old test build system (2.4 compability mode) " )
+ add_executable( dataconvert dataconvert.cc )
+ add_executable( checkpointing main.cc )
+ dune_add_test( dataconvert checkpointing )
+else()
+ dune_add_test( NAME dataconvert
+ SOURCES dataconvert.cc )
+ dune_add_test( NAME checkpointing
+ SOURCES main.cc )
+endif()
diff --git a/dune/fem-dg/test/euler/CMakeLists.txt b/dune/fem-dg/test/euler/CMakeLists.txt
index f3158bdce1f19fe637332bc9c6a6f6e4c89adccd..e4e7bc82f59024b71f01a38346c0de3d0300a422 100644
--- a/dune/fem-dg/test/euler/CMakeLists.txt
+++ b/dune/fem-dg/test/euler/CMakeLists.txt
@@ -10,12 +10,21 @@ add_definitions( "-DGRIDDIM=2" )
add_definitions( "-DFLUX=1" )
add_definitions( "-DPRIMALDG" )
-dune_add_test( NAME eulerall
- SOURCES main.cc problems/chorjo.cc
- COMPILE_DEFINITIONS LIMITER )
+if( DUNE_FEM_DG_VERSION VERSION_LESS "2.4.1" )
+ message( STATUS "Using old test build system (2.4 compability mode) " )
+ add_executable( euler main.cc )
+ add_executable( eulerall main.cc )
+ set_property(TARGET eulerall APPEND PROPERTY
+ COMPILE_DEFINITIONS "POLORDER=2" )
+ dune_add_test( euler eulerall )
+else()
+ dune_add_test( NAME eulerall
+ SOURCES main.cc problems/chorjo.cc
+ COMPILE_DEFINITIONS LIMITER )
-dune_add_test( NAME euler
- SOURCES main.cc problems/chorjo.cc
- COMPILE_DEFINITIONS POLORDER=2 )
+ dune_add_test( NAME euler
+ SOURCES main.cc problems/chorjo.cc
+ COMPILE_DEFINITIONS POLORDER=2 )
+endif()
add_code_generate_targets( euler eulerall )
diff --git a/dune/fem-dg/test/incompnavierstokes/CMakeLists.txt b/dune/fem-dg/test/incompnavierstokes/CMakeLists.txt
index b904a3c0000627a66ba06e4f2ab1c308328581b0..e175b3b590e95cc2fd8de8b086e0a72b6bef536e 100644
--- a/dune/fem-dg/test/incompnavierstokes/CMakeLists.txt
+++ b/dune/fem-dg/test/incompnavierstokes/CMakeLists.txt
@@ -7,12 +7,21 @@ configure_file(parameter.in ${CMAKE_CURRENT_BINARY_DIR}/parameter )
add_definitions( "-DYASPGRID" )
add_definitions( "-DGRIDDIM=2" )
-dune_add_test( NAME incompnavierstokesall
- SOURCES main.cc )
+if( DUNE_FEM_DG_VERSION VERSION_LESS "2.4.1" )
+ message( STATUS "Using old test build system (2.4 compability mode) " )
+ add_executable( incompnavierstokes main.cc )
+ add_executable( incompnavierstokesall main.cc )
+ set_property(TARGET incompnavierstokesall APPEND PROPERTY
+ COMPILE_DEFINITIONS "POLORDER=2" )
+ dune_add_test( incompnavierstokes incompnavierstokesall )
+else()
+ dune_add_test( NAME incompnavierstokesall
+ SOURCES main.cc )
-dune_add_test( NAME incompnavierstokes
- SOURCES main.cc
- COMPILE_DEFINITIONS POLORDER=2 )
+ dune_add_test( NAME incompnavierstokes
+ SOURCES main.cc
+ COMPILE_DEFINITIONS POLORDER=2 )
+endif()
#set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -O0")
diff --git a/dune/fem-dg/test/navierstokes/CMakeLists.txt b/dune/fem-dg/test/navierstokes/CMakeLists.txt
index ad0bf888cad099c3b3e125d72116d89be56274d4..4669057ef969b844ac49ad37d25957a7822c9bcf 100644
--- a/dune/fem-dg/test/navierstokes/CMakeLists.txt
+++ b/dune/fem-dg/test/navierstokes/CMakeLists.txt
@@ -9,11 +9,20 @@ endif()
add_definitions( "-DALUGRID_SIMPLEX" )
add_definitions( "-DGRIDDIM=2" )
-dune_add_test( NAME navierstokes
- SOURCES main.cc
- COMPILE_DEFINITIONS POLORDER=2 )
-dune_add_test( NAME navierstokesall
- SOURCES main.cc )
+if( DUNE_FEM_DG_VERSION VERSION_LESS "2.4.1" )
+ message( STATUS "Using old test build system (2.4 compability mode) " )
+ add_executable( navierstokes main.cc )
+ add_executable( navierstokesall main.cc )
+ set_property(TARGET navierstokesall APPEND PROPERTY
+ COMPILE_DEFINITIONS "POLORDER=2" )
+ dune_add_test( navierstokes navierstokesall )
+else()
+ dune_add_test( NAME navierstokes
+ SOURCES main.cc
+ COMPILE_DEFINITIONS POLORDER=2 )
+ dune_add_test( NAME navierstokesall
+ SOURCES main.cc )
+endif()
#set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -O0" )
diff --git a/dune/fem-dg/test/poisson/CMakeLists.txt b/dune/fem-dg/test/poisson/CMakeLists.txt
index ae21044f6983106c72caffd6041230c0339a383c..ffba4172a08e254bcd4bda9f60e99297f43a30c4 100644
--- a/dune/fem-dg/test/poisson/CMakeLists.txt
+++ b/dune/fem-dg/test/poisson/CMakeLists.txt
@@ -9,12 +9,20 @@ add_definitions( "-DALUGRID_CUBE" )
add_definitions( "-DGRIDDIM=2" )
add_definitions( "-DDIMRANGE=1" )
-dune_add_test( NAME poissonall
- SOURCES main.cc
- COMPILE_DEFINITIONS DGSCHEME ONB )
-dune_add_test( NAME poisson
- SOURCES main.cc
- COMPILE_DEFINITIONS POLORDER=2)
+if( DUNE_FEM_DG_VERSION VERSION_LESS "2.4.1" )
+ message( STATUS "Using old test build system (2.4 compability mode) " )
+ add_executable( poisson main.cc )
+ add_executable( poissonall main.cc )
+ set_property(TARGET poissonall APPEND PROPERTY
+ COMPILE_DEFINITIONS "POLORDER=2" )
+ dune_add_test( poisson poissonall )
+else()
+ dune_add_test( NAME poissonall
+ SOURCES main.cc )
+ dune_add_test( NAME poisson
+ SOURCES main.cc
+ COMPILE_DEFINITIONS POLORDER=2)
+endif()
#set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -O0" )
diff --git a/dune/fem-dg/test/stokes/CMakeLists.txt b/dune/fem-dg/test/stokes/CMakeLists.txt
index 1d4640e89681eace9048e2570e7b601881573275..09ba9606bca8c638d9252a8d89b741a657921441 100644
--- a/dune/fem-dg/test/stokes/CMakeLists.txt
+++ b/dune/fem-dg/test/stokes/CMakeLists.txt
@@ -8,11 +8,20 @@ endif()
add_definitions( "-DYASPGRID" )
add_definitions( "-DGRIDDIM=2" )
-dune_add_test( NAME stokes
- SOURCES main.cc
- COMPILE_DEFINITIONS POLORDER=2 )
-dune_add_test( NAME stokesall
- SOURCES main.cc )
+if( DUNE_FEM_DG_VERSION VERSION_LESS "2.4.1" )
+ message( STATUS "Using old test build system (2.4 compability mode) " )
+ add_executable( stokes main.cc )
+ add_executable( stokesall main.cc )
+ set_property(TARGET stokesall APPEND PROPERTY
+ COMPILE_DEFINITIONS "POLORDER=2" )
+ dune_add_test( stokes stokesall )
+else()
+ dune_add_test( NAME stokes
+ SOURCES main.cc
+ COMPILE_DEFINITIONS POLORDER=2 )
+ dune_add_test( NAME stokesall
+ SOURCES main.cc )
+endif()
#set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -O0")