Formatted and added missing CMakeLists.txt for tests.

git-svn-id: svn://svn.iws.uni-stuttgart.de/DUMUX/dumux/trunk@7612 2fb0f335-1f38-0410-981e-8018bf24f1b0

test/CMakeLists.txt

-# directories which are commented out do not compile at the moment
-# (they also don't compile if using the old build system)!
-
 add_subdirectory("boxmodels")
-add_subdirectory("material")
 add_subdirectory("common")
 add_subdirectory("decoupled")
-
+add_subdirectory("freeflow")
+add_subdirectory("material")

test/boxmodels/1p/CMakeLists.txt

 # build target for the onephase-onecomponent test problem
-ADD_EXECUTABLE("test_1p" test_1p.cc)
-TARGET_LINK_LIBRARIES("test_1p" ${DumuxLinkLibraries})
+add_executable("test_1p" test_1p.cc)
+target_link_libraries("test_1p" ${DumuxLinkLibraries})
 
 # add required libraries and includes to the build flags 
-LINK_DIRECTORIES(${DumuxLinkDirectories})
-INCLUDE_DIRECTORIES(${DumuxIncludeDirectories})
+link_directories(${DumuxLinkDirectories})
+include_directories(${DumuxIncludeDirectories})
 
 # make sure the grids are present in the build directory
 add_custom_command(TARGET "test_1p"

test/boxmodels/1p2c/CMakeLists.txt

-ADD_EXECUTABLE("test_1p2c" test_1p2c.cc)
-TARGET_LINK_LIBRARIES("test_1p2c" ${DumuxLinkLibraries})
+add_executable("test_1p2c" test_1p2c.cc)
+target_link_libraries("test_1p2c" ${DumuxLinkLibraries})
 
 # add required libraries and includes to the build flags 
-LINK_DIRECTORIES(${DumuxLinkDirectories})
-INCLUDE_DIRECTORIES(${DumuxIncludeDirectories})
+link_directories(${DumuxLinkDirectories})
+include_directories(${DumuxIncludeDirectories})
 
 # make sure the grids are present in the build directory
 add_custom_command(TARGET "test_1p2c"

test/boxmodels/2p/CMakeLists.txt

 # build target for the simple twophase lens problem
-ADD_EXECUTABLE("test_2p" test_2p.cc)
-TARGET_LINK_LIBRARIES("test_2p" ${DumuxLinkLibraries})
+add_executable("test_2p" test_2p.cc)
+target_link_libraries("test_2p" ${DumuxLinkLibraries})
 
 # add required libraries and includes to the build flags 
-LINK_DIRECTORIES(${DumuxLinkDirectories})
-INCLUDE_DIRECTORIES(${DumuxIncludeDirectories})
+link_directories(${DumuxLinkDirectories})
+include_directories(${DumuxIncludeDirectories})
 
 # make sure the grids are present in the build directory
 add_custom_command(TARGET "test_2p"
@@ -13,4 +13,3 @@ add_custom_command(TARGET "test_2p"
                         copy_directory 
                            "${CMAKE_CURRENT_SOURCE_DIR}/grids"
                            "${CMAKE_CURRENT_BINARY_DIR}/grids")
-

test/boxmodels/2p2c/CMakeLists.txt

 # build target for the twophase-twocomponent test problem
-ADD_EXECUTABLE("test_2p2c" test_2p2c.cc)
-TARGET_LINK_LIBRARIES("test_2p2c" ${DumuxLinkLibraries})
+add_executable("test_2p2c" test_2p2c.cc)
+target_link_libraries("test_2p2c" ${DumuxLinkLibraries})
 
 # add required libraries and includes to the build flags 
-LINK_DIRECTORIES(${DumuxLinkDirectories})
-INCLUDE_DIRECTORIES(${DumuxIncludeDirectories})
+link_directories(${DumuxLinkDirectories})
+include_directories(${DumuxIncludeDirectories})
 
 # make sure the grids are present in the build directory
 add_custom_command(TARGET "test_2p2c"

test/boxmodels/2p2cni/CMakeLists.txt

 # build target for the 2p2cni test problem
-ADD_EXECUTABLE("test_2p2cni" test_2p2cni.cc)
-TARGET_LINK_LIBRARIES("test_2p2cni" ${DumuxLinkLibraries})
+add_executable("test_2p2cni" test_2p2cni.cc)
+target_link_libraries("test_2p2cni" ${DumuxLinkLibraries})
 
 # add required libraries and includes to the build flags 
-LINK_DIRECTORIES(${DumuxLinkDirectories})
-INCLUDE_DIRECTORIES(${DumuxIncludeDirectories})
+link_directories(${DumuxLinkDirectories})
+include_directories(${DumuxIncludeDirectories})
 
 # make sure the grids are present in the build directory
 add_custom_command(TARGET "test_2p2cni"

test/boxmodels/2pni/CMakeLists.txt

-ADD_EXECUTABLE("test_2pni" test_2pni.cc)
-TARGET_LINK_LIBRARIES("test_2pni" ${DumuxLinkLibraries})
+add_executable("test_2pni" test_2pni.cc)
+target_link_libraries("test_2pni" ${DumuxLinkLibraries})
 
 # add required libraries and includes to the build flags 
-LINK_DIRECTORIES(${DumuxLinkDirectories})
-INCLUDE_DIRECTORIES(${DumuxIncludeDirectories})
+link_directories(${DumuxLinkDirectories})
+include_directories(${DumuxIncludeDirectories})
 
 
 # make sure the grids are present in the build directory

test/boxmodels/3p3c/CMakeLists.txt

+add_executable("test_3p3c" test_3p3c.cc)
+target_link_libraries("test_3p3c" ${DumuxLinkLibraries})
+
+# add required libraries and includes to the build flags 
+link_directories(${DumuxLinkDirectories})
+include_directories(${DumuxIncludeDirectories})
+
+
+# make sure the grids are present in the build directory
+add_custom_command(TARGET "test_3p3c"
+                   POST_BUILD
+                   COMMAND ${CMAKE_COMMAND} -E
+                        copy_directory 
+                           "${CMAKE_CURRENT_SOURCE_DIR}/grids"
+                           "${CMAKE_CURRENT_BINARY_DIR}/grids")

test/boxmodels/3p3cni/CMakeLists.txt

+add_executable("test_3p3cni" test_3p3cni.cc)
+target_link_libraries("test_3p3cni" ${DumuxLinkLibraries})
+
+# add required libraries and includes to the build flags 
+link_directories(${DumuxLinkDirectories})
+include_directories(${DumuxIncludeDirectories})
+
+
+# make sure the grids are present in the build directory
+add_custom_command(TARGET "test_3p3cni"
+                   POST_BUILD
+                   COMMAND ${CMAKE_COMMAND} -E
+                        copy_directory 
+                           "${CMAKE_CURRENT_SOURCE_DIR}/grids"
+                           "${CMAKE_CURRENT_BINARY_DIR}/grids")

test/boxmodels/CMakeLists.txt

-# directories which are commented out do not compile at the moment
-# (they also don't compile if using the old build system)!
-
 add_subdirectory("1p")
 add_subdirectory("1p2c")
 add_subdirectory("2p")
-add_subdirectory("2pni")
 add_subdirectory("2p2c")
 add_subdirectory("2p2cni")
+add_subdirectory("2pni")
+add_subdirectory("3p3c")
+add_subdirectory("3p3cni")
 add_subdirectory("MpNc")
 add_subdirectory("richards")
-

test/boxmodels/MpNc/CMakeLists.txt

 # build target for the twophase-twocomponent test problem
-ADD_EXECUTABLE("test_MpNc" test_MpNc.cc)
-TARGET_LINK_LIBRARIES("test_MpNc" ${DumuxLinkLibraries})
+add_executable("test_MpNc" test_MpNc.cc)
+target_link_libraries("test_MpNc" ${DumuxLinkLibraries})
 
 # add required libraries and includes to the build flags 
-LINK_DIRECTORIES(${DumuxLinkDirectories})
-INCLUDE_DIRECTORIES(${DumuxIncludeDirectories})
+link_directories(${DumuxLinkDirectories})
+include_directories(${DumuxIncludeDirectories})
 
 # make sure the grids are present in the build directory
 add_custom_command(TARGET "test_MpNc"

test/boxmodels/richards/CMakeLists.txt

@@ -4,12 +4,12 @@ if (MPI_FOUND)
 endif (MPI_FOUND)
 
 # build target for the twophase-twocomponent test problem
-ADD_EXECUTABLE("test_richards" test_richards.cc)
-TARGET_LINK_LIBRARIES("test_richards" ${DumuxLinkLibraries})
+add_executable("test_richards" test_richards.cc)
+target_link_libraries("test_richards" ${DumuxLinkLibraries})
 
 # add required libraries and includes to the build flags 
-LINK_DIRECTORIES(${DumuxLinkDirectories})
-INCLUDE_DIRECTORIES(${DumuxIncludeDirectories})
+link_directories(${DumuxLinkDirectories})
+include_directories(${DumuxIncludeDirectories})
 
 # make sure the grids are present in the build directory
 add_custom_command(TARGET "test_richards"

test/common/CMakeLists.txt

-# directories which are commented out do not compile at the moment
-# (they also don't compile if using the old build system)!
-
 add_subdirectory("generalproblem")
 add_subdirectory("propertysystem")
 add_subdirectory("spline")
-

test/common/generalproblem/CMakeLists.txt

 # build target for the simple twophase lens problem in a general definition for both box and decoupled model
-ADD_EXECUTABLE("test_generalproblem_2p" test_generalproblem_2p.cc)
-TARGET_LINK_LIBRARIES("test_generalproblem_2p" ${DumuxLinkLibraries})
+add_executable("test_generalproblem_2p" test_generalproblem_2p.cc)
+target_link_libraries("test_generalproblem_2p" ${DumuxLinkLibraries})
 
 # add required libraries and includes to the build flags 
-LINK_DIRECTORIES(${DumuxLinkDirectories})
-INCLUDE_DIRECTORIES(${DumuxIncludeDirectories})
+link_directories(${DumuxLinkDirectories})
+include_directories(${DumuxIncludeDirectories})

test/common/propertysystem/CMakeLists.txt

 # build the test for the property system
-ADD_EXECUTABLE("test_propertysystem" test_propertysystem.cc)
+add_executable("test_propertysystem" test_propertysystem.cc)
 
 # add required libraries and includes to the build flags 
-INCLUDE_DIRECTORIES(${DumuxIncludeDirectories})
+include_directories(${DumuxIncludeDirectories})

test/common/spline/CMakeLists.txt

 # add build targets
-ADD_EXECUTABLE("test_spline" test_spline.cc)
-TARGET_LINK_LIBRARIES("test_spline" ${DumuxLinkLibraries})
+add_executable("test_spline" test_spline.cc)
+target_link_libraries("test_spline" ${DumuxLinkLibraries})
 
 # add required libraries and includes to the build flags 
-LINK_DIRECTORIES(${DumuxLinkDirectories})
-INCLUDE_DIRECTORIES(${DumuxIncludeDirectories})
+link_directories(${DumuxLinkDirectories})
+include_directories(${DumuxIncludeDirectories})
 

test/decoupled/1p/CMakeLists.txt

 # add build targets
-ADD_EXECUTABLE("test_diffusion" test_diffusion.cc)
-TARGET_LINK_LIBRARIES("test_diffusion" ${DumuxLinkLibraries})
+add_executable("test_diffusion" test_diffusion.cc)
+target_link_libraries("test_diffusion" ${DumuxLinkLibraries})
 
-ADD_EXECUTABLE("test_dec1p" test_1p.cc)
-TARGET_LINK_LIBRARIES("test_dec1p" ${DumuxLinkLibraries})
+add_executable("test_dec1p" test_1p.cc)
+target_link_libraries("test_dec1p" ${DumuxLinkLibraries})
 
 # add required libraries and includes to the build flags 
-LINK_DIRECTORIES(${DumuxLinkDirectories})
-INCLUDE_DIRECTORIES(${DumuxIncludeDirectories})
+link_directories(${DumuxLinkDirectories})
+include_directories(${DumuxIncludeDirectories})
 
 # make sure the grids are present in the build directory
 add_custom_command(TARGET "test_diffusion"

test/decoupled/2p/CMakeLists.txt

 # add build targets
 ADD_EXECUTABLE("test_impes" test_impes.cc)
-TARGET_LINK_LIBRARIES("test_impes" ${DumuxLinkLibraries})
+target_link_libraries("test_impes" ${DumuxLinkLibraries})
 
-ADD_EXECUTABLE("test_transport" test_transport.cc)
-TARGET_LINK_LIBRARIES("test_transport" ${DumuxLinkLibraries})
+add_executable("test_transport" test_transport.cc)
+target_link_libraries("test_transport" ${DumuxLinkLibraries})
 
 # add required libraries and includes to the build flags 
-LINK_DIRECTORIES(${DumuxLinkDirectories})
-INCLUDE_DIRECTORIES(${DumuxIncludeDirectories})
+link_directories(${DumuxLinkDirectories})
+include_directories(${DumuxIncludeDirectories})
 
 # make sure the grids are present in the build directory
 add_custom_command(TARGET "test_transport"

test/decoupled/2p2c/CMakeLists.txt

 # add build targets
-ADD_EXECUTABLE("test_dec2p2c" test_dec2p2c.cc)
-TARGET_LINK_LIBRARIES("test_dec2p2c" ${DumuxLinkLibraries})
+add_executable("test_dec2p2c" test_dec2p2c.cc)
+target_link_libraries("test_dec2p2c" ${DumuxLinkLibraries})
 
-ADD_EXECUTABLE("test_multiphysics2p2c" test_multiphysics2p2c.cc)
-TARGET_LINK_LIBRARIES("test_multiphysics2p2c" ${DumuxLinkLibraries})
+add_executable("test_multiphysics2p2c" test_multiphysics2p2c.cc)
+target_link_libraries("test_multiphysics2p2c" ${DumuxLinkLibraries})
 
 # add required libraries and includes to the build flags 
-LINK_DIRECTORIES(${DumuxLinkDirectories})
-INCLUDE_DIRECTORIES(${DumuxIncludeDirectories})
+link_directories(${DumuxLinkDirectories})
+include_directories(${DumuxIncludeDirectories})

test/decoupled/2padaptive/CMakeLists.txt

 add_definitions(-DYASPGRID -DGRIDDIM=2 -DENABLE_UG)
 
 # add build targets
-ADD_EXECUTABLE("test_impes_adaptive" test_impes.cc)
-TARGET_LINK_LIBRARIES("test_impes_adaptive" ${DumuxLinkLibraries})
+add_executable("test_impes_adaptive" test_impes_adaptive.cc)
+target_link_libraries("test_impes_adaptive" ${DumuxLinkLibraries})
 
 # add required libraries and includes to the build flags 
-LINK_DIRECTORIES(${DumuxLinkDirectories})
-INCLUDE_DIRECTORIES(${DumuxIncludeDirectories})
+link_directories(${DumuxLinkDirectories})
+include_directories(${DumuxIncludeDirectories})
 
 # make sure the grids are present in the build directory
-add_custom_command(TARGET "test_transport"
+add_custom_command(TARGET "test_impes_adaptive"
                    POST_BUILD
                    COMMAND ${CMAKE_COMMAND} -E
                         copy_directory