[Merge][CMake] Merged revisions : 1563

Revision  r1563
.----------------------
make build_tests runs smoothly now.

[[Imported from SVN: r1798]]

dune/istl/paamg/test/CMakeLists.txt

 set(MPITESTS  galerkintest hierarchytest pamgtest
   pamg_comm_repart_test transfertest)
-
 set(NORMALTESTS amgtest graphtest kamgtest)
-
+set(ALLTESTS ${MPITESTS} ${NORMALTESTS})
 # We do not want want to build the tests during make all,
 # but just build them on demand
-add_dependencies(build_tests ${MPITESTS} ${NORMALTESTS})
+add_dependencies(build_tests ${ALLTESTS})
 
 add_executable(amgtest "amgtest.cc")
 add_executable(galerkintest "galerkintest.cc")
@@ -17,9 +16,13 @@ set_target_properties(pamg_comm_repart_test PROPERTIES COMPILE_FLAGS "-DAMG_REPA
 add_executable(pamgtest "parallelamgtest.cc")
 add_executable(transfertest "transfertest.cc")
 
+message("MPITESTS=${MPITESTS}")
+
+message("ALLTESTS=${ALLTESTS}")
+
 foreach(_exe ${ALLTESTS})
   target_link_libraries(${_exe} "dunecommon")
 endforeach(_exe ${ALLTESTS})
 
 include(DuneMPI)
-add_dune_mpi_flags(${MPITESTS})
+add_dune_mpi_flags("${MPITESTS}")

dune/istl/test/CMakeLists.txt

-set(MPITESTS vectorcommtest matrixmarkettestmatrixredisttest )
+set(MPITESTS vectorcommtest matrixmarkettest matrixredisttest )
 set(NORMALTEST basearraytest matrixutilstest matrixtest
   bvectortest vbvectortest bcrsbuildtest matrixiteratortest mv
   iotest scaledidmatrixtest seqmatrixmarkettest)
@@ -12,13 +12,31 @@ if(HAVE_SUPERLU)
     overlappingschwarztest)
 endif(HAVE_SUPERLU)
 
-set(NORMALTEST amgtest graphtest kamgtest)
-
+set(ALLTESTS ${MPITESTS} ${NORMALTEST} ${PARDISOTEST} ${SUPERLUTESTS})
+message("ALLTESTS=${ALLTESTS}")
+message("MPITESTS=${MPITESTS}")
 # We do not want want to build the tests during make all,
 # but just build them on demand
-add_dependencies(build_tests ${MPITESTS} ${NORMALTEST} ${PARDISOTEST} ${SUPERLUTESTS})
+add_dependencies(build_tests ${ALLTESTS})
+
+
+include(DuneMPI)
 
 # Provide source files
+add_executable(basearraytest "basearraytest.cc")
+add_executable(matrixutilstest "matrixutilstest.cc")
+add_executable(matrixtest "matrixtest.cc")
+add_executable(bvectortest "bvectortest.cc")
+add_executable(vbvectortest "vbvectortest.cc")
+add_executable(bcrsbuildtest "bcrsbuild.cc")
+add_executable(matrixiteratortest "matrixiteratortest.cc")
+add_executable(mv "mv.cc")
+add_executable(iotest "iotest.cc")
+add_executable(scaledidmatrixtest "scaledidmatrixtest.cc")
+add_executable(seqmatrixmarkettest "matrixmarkettest.cc")
+#set_target_properties(seqmatrixmarkettest PROPERTIES COMPILE_FLAGS
+#  "-DMMSEQUENTIAL ${MPI_DUNE_COMPILE_FLAGS} -DENABLE_MPI=1 -DMPICH_SKIP_MPICXX -DMPIPP_H")
+
 if(HAVE_PARDISO)
   add_executable(pardiso_test test_pardiso.cc)
 
@@ -42,13 +60,11 @@ if(HAVE_SUPERLU)
   # TODO add superlu flags
 endif(HAVE_SUPERLU)
 
-include(DuneMPI)
-
 if(HAVE_MPI)
   add_executable(matrixredisttest "matrixredisttest.cc")
   add_executable(vectorcommtest "vectorcommtest.cc")
   add_executable(matrixmarkettest "matrixmarkettest.cc")
-  add_dune_mpi_flags(${MPITESTS})
+  add_dune_mpi_flags("${MPITESTS}")
 endif(HAVE_MPI)
 
 foreach(_exe ${ALLTESTS})