[Merge][CMake] Merge support for CMake from CMake branch.

[[Imported from SVN: r1916]]

dune-istl-version.cmake.in

+set(PACKAGE_VERSION "@DUNE_MOD_VERSION@")
+
+if(NOT "${PACKAGE_FIND_VERSION}" VERSION_GREATER "@DUNE_MOD_VERSION@")
+  set (PACKAGE_VERSION_COMPATIBLE 1) # compatible with older
+  if ("${PACKAGE_FIND_VERSION}" VERSION_EQUAL "@DUNE_MOD_VERSION@")
+    set(PACKAGE_VERSION_EXACT 1) #exact match for this version
+  endif()
+endif()

dune/CMakeLists.txt

+add_subdirectory(istl)

dune/Makefile.am

@@ -3,3 +3,5 @@
 SUBDIRS = istl
 
 include $(top_srcdir)/am/global-rules
+
+EXTRA_DIST = CMakeLists.txt

dune/istl/CMakeLists.txt

+add_subdirectory("paamg")
+add_subdirectory("tutorial")
+add_subdirectory("test" EXCLUDE_FROM_ALL)
+
+#install headers
+install(FILES
+   basearray.hh
+   bcrsmatrix.hh
+   bdmatrix.hh
+   btdmatrix.hh
+   bvector.hh
+   diagonalmatrix.hh
+   gsetc.hh
+   ilu.hh
+   ilusubdomainsolver.hh
+   io.hh
+   istlexception.hh
+   matrix.hh
+   matrixindexset.hh
+   matrixmarket.hh
+   matrixmatrix.hh
+   matrixredistribute.hh
+   matrixutils.hh
+   multitypeblockmatrix.hh
+   multitypeblockvector.hh
+   novlpschwarz.hh
+   operators.hh
+   overlappingschwarz.hh
+   owneroverlapcopy.hh
+   pardiso.hh
+   preconditioners.hh
+   repartition.hh
+   scalarproducts.hh
+   scaledidmatrix.hh
+   schwarz.hh
+   solvercategory.hh
+   solvers.hh
+   solvertype.hh
+   superlu.hh
+   supermatrix.hh
+   vbvector.hh
+   DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dune/istl)

dune/istl/Makefile.am

@@ -41,3 +41,5 @@ istl_HEADERS = basearray.hh \
 
 
 include $(top_srcdir)/am/global-rules
+
+EXTRA_DIST = CMakeLists.txt

dune/istl/paamg/CMakeLists.txt

+add_subdirectory("test" EXCLUDE_FROM_ALL)
+
+#install headers
+install(FILES aggregates.hh dependency.hh galerkin.hh graph.hh
+          indicescoarsener.hh properties.hh globalaggregates.hh
+          hierarchy.hh construction.hh
+          transfer.hh smoother.hh amg.hh kamg.hh combinedfunctor.hh
+          graphcreator.hh parameters.hh renumberer.hh pinfo.hh
+	DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dune/istl/paamg)

dune/istl/paamg/Makefile.am

@@ -8,3 +8,5 @@ paamg_HEADERS = aggregates.hh dependency.hh galerkin.hh graph.hh \
 	graphcreator.hh parameters.hh renumberer.hh pinfo.hh
 
 include $(top_srcdir)/am/global-rules
+
+EXTRA_DIST = CMakeLists.txt

dune/istl/paamg/test/.gitignore

@@ -12,3 +12,4 @@ pamg_comm_repart_test
 transfertest
 kamgtest
 fastamg
+

dune/istl/paamg/test/CMakeLists.txt

+if(MPI_FOUND)
+  set(MPITESTS  galerkintest hierarchytest transfertest)
+endif(MPI_FOUND)
+
+if(ParMETIS_FOUND)
+  set(PARMETISTESTS pamgtest pamg_comm_repart_test)
+endif(ParMETIS_FOUND)
+
+set(NORMALTESTS amgtest fastamg graphtest kamgtest)
+set(ALLTESTS ${MPITESTS} ${PARMETISTESTS} ${NORMALTESTS})
+
+# We do not want want to build the tests during make all,
+# but just build them on demand
+add_directory_test_target(_test_target)
+add_dependencies(${_test_target} ${ALLTESTS})
+
+add_executable(amgtest "amgtest.cc")
+add_dune_superlu_flags(amgtest)
+add_executable(fastamg "fastamg.cc")
+add_dune_superlu_flags(fastamg)
+add_executable(galerkintest "galerkintest.cc")
+add_executable(graphtest "graphtest.cc")
+add_executable(hierarchytest "hierarchytest.cc")
+add_executable(kamgtest "kamgtest.cc")
+add_dune_superlu_flags(kamgtest)
+add_executable(pamg_comm_repart_test "parallelamgtest.cc")
+set_target_properties(pamg_comm_repart_test PROPERTIES COMPILE_FLAGS "-DAMG_REPART_ON_COMM_GRAPH")
+add_executable(pamgtest "parallelamgtest.cc")
+add_dune_superlu_flags(pamgtest)
+add_executable(transfertest "transfertest.cc")
+
+foreach(_exe ${ALLTESTS})
+  target_link_libraries(${_exe} "dunecommon")
+  add_test(${_exe} ${_exe})
+endforeach(_exe ${ALLTESTS})
+
+add_dune_mpi_flags("${MPITESTS}")
+add_dune_parmetis_flags("${PARMETISTESTS}")

dune/istl/paamg/test/Makefile.am

@@ -96,3 +96,5 @@ pamg_comm_repart_test_LDADD =				\
 
 
 include $(top_srcdir)/am/global-rules
+
+EXTRA_DIST = CMakeLists.txt

dune/istl/test/.gitignore

@@ -30,3 +30,4 @@ testvec
 superluctest
 seqmatrixmarkettest
 solvertest
+

dune/istl/test/CMakeLists.txt

+set(NORMALTEST
+  basearraytest
+  bvectortest
+  bcrsbuildtest
+  dotproducttest
+  iotest
+  matrixiteratortest
+  matrixtest
+  matrixutilstest
+  mmtest
+  mv
+  scaledidmatrixtest
+  seqmatrixmarkettest
+  vbvectortest)
+
+if(HAVE_PARDISO)
+  set(PARDISOTEST test_pardiso)
+endif(HAVE_PARDISO)
+
+if(SUPERLU_FOUND)
+  set(SUPERLUTESTS
+  complexrhstest superlutest superluztest superluctest superlustest
+    overlappingschwarztest)
+endif(SUPERLU_FOUND)
+
+if(HAVE_MPI)
+  set(MPITESTS vectorcommtest matrixmarkettest matrixredisttest)
+endif(HAVE_MPI)
+
+set(ALLTESTS ${MPITESTS} ${NORMALTEST} ${PARDISOTEST} ${SUPERLUTESTS})
+
+
+# We do not want want to build the tests during make all,
+# but just build them on demand
+add_directory_test_target(_test_target)
+add_dependencies(${_test_target} ${ALLTESTS})
+
+
+include(DuneMPI)
+
+# Provide source files
+add_executable(basearraytest "basearraytest.cc")
+add_executable(dotproducttest "dotproducttest.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(mmtest mmtest.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)
+
+  # TODO add pardiso flags
+endif(HAVE_PARDISO)
+
+if(SUPERLU_FOUND)
+  add_executable(complexrhstest complexrhstest.cc)
+  set_property(TARGET complexrhstest APPEND PROPERTY COMPILE_DEFINITIONS "SUPERLU_NTYPE=3")
+
+  add_executable(superlutest "superlutest.cc")
+
+  add_executable(superlustest "superlutest.cc")
+  set_property(TARGET superlustest APPEND PROPERTY COMPILE_DEFINITIONS "SUPERLU_NTYPE=0")
+
+  add_executable(superluctest "superlutest.cc")
+  set_property(TARGET superluctest APPEND PROPERTY COMPILE_DEFINITIONS "SUPERLU_NTYPE=2")
+
+  add_executable(superluztest "superlutest.cc")
+  set_property(TARGET superluztest APPEND PROPERTY COMPILE_DEFINITIONS "SUPERLU_NTYPE=3")
+
+  add_executable(overlappingschwarztest "overlappingschwarztest.cc")
+
+  add_dune_superlu_flags("${SUPERLUTESTS}")
+endif(SUPERLU_FOUND)
+
+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_parmetis_flags(matrixredisttest)
+endif(HAVE_MPI)
+
+foreach(_exe ${ALLTESTS})
+  target_link_libraries(${_exe} "dunecommon")
+  add_test(${_exe} ${_exe})
+endforeach(_exe ${ALLTESTS})

dune/istl/test/Makefile.am

@@ -140,3 +140,5 @@ if MPI
 	$(LDADD)
 endif
 include $(top_srcdir)/am/global-rules
+
+EXTRA_DIST = CMakeLists.txt

dune/istl/tutorial/CMakeLists.txt

+add_executable(example "example.cc")
+add_dune_mpi_flags(example)
+add_dune_boost_flags(example)
+target_link_libraries(example "dunecommon")

dune/istl/tutorial/Makefile.am

@@ -7,3 +7,5 @@ example_SOURCES = example.cc
 example_CPPFLAGS = $(AM_CPPFLAGS) $(BOOST_CPPFLAGS) $(DUNE_CPPFLAGS)
 
 include $(top_srcdir)/am/global-rules
+
+EXTRA_DIST = CMakeLists.txt

m4/CMakeLists.txt

+install(PROGRAMS
+  dune_istl.m4 pardiso.m4 superlu-dist.m4 superlu.m4
+  DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/aclocal)
+

m4/Makefile.am

@@ -9,6 +9,6 @@ ALLM4S = 					\
 aclocaldir = $(datadir)/aclocal
 aclocal_DATA = $(ALLM4S)
 
-EXTRA_DIST = $(ALLM4S)
+EXTRA_DIST = CMakeLists.txt $(ALLM4S)
 
 include $(top_srcdir)/am/global-rules