Skip to content
Snippets Groups Projects
Commit edb5f6e6 authored by Elias Pipping's avatar Elias Pipping Committed by pipping
Browse files

Regenerate build system using duneproject

This takes care of shipping cmake files, installing documentation
properly, etc.

[[Imported from SVN: r12963]]
parent ccc989e7
No related branches found
No related tags found
No related merge requests found
...@@ -5,4 +5,6 @@ operators_HEADERS = lowrankoperator.hh \ ...@@ -5,4 +5,6 @@ operators_HEADERS = lowrankoperator.hh \
nulloperator.hh \ nulloperator.hh \
sumoperator.hh sumoperator.hh
EXTRA_DIST = CMakeLists.txt
include $(top_srcdir)/am/global-rules include $(top_srcdir)/am/global-rules
...@@ -5,4 +5,6 @@ solvers_HEADERS = cgsolver.cc cgsolver.hh iterativesolver.cc iterativesolver.hh ...@@ -5,4 +5,6 @@ solvers_HEADERS = cgsolver.cc cgsolver.hh iterativesolver.cc iterativesolver.hh
loopsolver.cc loopsolver.hh quadraticipopt.hh solver.hh \ loopsolver.cc loopsolver.hh quadraticipopt.hh solver.hh \
tcgsolver.cc tcgsolver.hh tcgsolver.cc tcgsolver.hh
EXTRA_DIST = CMakeLists.txt
include $(top_srcdir)/am/global-rules include $(top_srcdir)/am/global-rules
\ No newline at end of file
...@@ -7,4 +7,6 @@ transferoperators_HEADERS = compressedmultigridtransfer.hh multigridtransfer.hh ...@@ -7,4 +7,6 @@ transferoperators_HEADERS = compressedmultigridtransfer.hh multigridtransfer.hh
genericmultigridtransfer.hh mandelobsrestrictor.hh truncatedcompressedmgtransfer.cc \ genericmultigridtransfer.hh mandelobsrestrictor.hh truncatedcompressedmgtransfer.cc \
truncateddensemgtransfer.hh truncateddensemgtransfer.hh
EXTRA_DIST = CMakeLists.txt
include $(top_srcdir)/am/global-rules include $(top_srcdir)/am/global-rules
\ No newline at end of file
install(FILES install(FILES
dune-solvers.m4 dune-solvers.m4
ipopt.m4 ipopt.m4
DESTINATION share/dune/aclocal) DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/dune/aclocal)
...@@ -3,6 +3,6 @@ M4FILES = dune-solvers.m4 ipopt.m4 ...@@ -3,6 +3,6 @@ M4FILES = dune-solvers.m4 ipopt.m4
aclocaldir = $(datadir)/dune/aclocal aclocaldir = $(datadir)/dune/aclocal
aclocal_DATA = $(M4FILES) aclocal_DATA = $(M4FILES)
EXTRA_DIST = $(M4FILES) EXTRA_DIST = $(M4FILES) CMakeLists.txt
include $(top_srcdir)/am/global-rules include $(top_srcdir)/am/global-rules
# Additional checks needed to build the module dnl -*- autoconf -*-
# Macros needed to find dune-solvers and dependent libraries. They are called by
# the macros in ${top_src_dir}/dependencies.m4, which is generated by
# "dunecontrol autogen"
# Additional checks needed to build dune-solvers
# This macro should be invoked by every module which depends on dune-solvers, as
# well as by dune-solvers itself
AC_DEFUN([DUNE_SOLVERS_CHECKS],[ AC_DEFUN([DUNE_SOLVERS_CHECKS],[
AC_REQUIRE([DUNE_IPOPT]) AC_REQUIRE([DUNE_IPOPT])
]) ])
# Additional checks needed to find the module # Additional checks needed to find dune-solvers
AC_DEFUN([DUNE_SOLVERS_CHECK_MODULE],[ # This macro should be invoked by every module which depends on dune-solvers, but
DUNE_CHECK_MODULES([dune-solvers], [solvers/solvers/solver.hh]) # not by dune-solvers itself
AC_DEFUN([DUNE_SOLVERS_CHECK_MODULE],
[
DUNE_CHECK_MODULES([dune-solvers],[solvers/solvers/solver.hh])
]) ])
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment