From 8e74f4b6ec3e6f23e2e0b2dc3ac02afebb049974 Mon Sep 17 00:00:00 2001 From: Markus Blatt <mblatt@dune-project.org> Date: Wed, 13 Feb 2013 15:10:38 +0000 Subject: [PATCH] Install cmake modules [[Imported from SVN: r1786]] --- Makefile.am | 2 +- cmake/.gitignore | 2 ++ cmake/Makefile.am | 1 + cmake/modules/.gitignore | 2 ++ cmake/modules/Makefile.am | 7 +++++++ cmake/pkg/.gitignore | 2 ++ cmake/pkg/Makefile.am | 0 configure.ac | 3 +++ 8 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 cmake/.gitignore create mode 100644 cmake/Makefile.am create mode 100644 cmake/modules/.gitignore create mode 100644 cmake/modules/Makefile.am create mode 100644 cmake/pkg/.gitignore create mode 100644 cmake/pkg/Makefile.am diff --git a/Makefile.am b/Makefile.am index 0ed9bf31..4898650f 100644 --- a/Makefile.am +++ b/Makefile.am @@ -7,7 +7,7 @@ EXTRA_DIST=dune.module # we need automake 1.9 or newer AUTOMAKE_OPTIONS = foreign 1.9 -SUBDIRS = dune doc m4 +SUBDIRS = cmake dune doc m4 # use configured compiler for "make distcheck" # doxygen is difficult to convince to build in a special directory... diff --git a/cmake/.gitignore b/cmake/.gitignore new file mode 100644 index 00000000..3dda7298 --- /dev/null +++ b/cmake/.gitignore @@ -0,0 +1,2 @@ +Makefile.in +Makefile diff --git a/cmake/Makefile.am b/cmake/Makefile.am new file mode 100644 index 00000000..4fce05b9 --- /dev/null +++ b/cmake/Makefile.am @@ -0,0 +1 @@ +SUBDIRS= modules pkg diff --git a/cmake/modules/.gitignore b/cmake/modules/.gitignore new file mode 100644 index 00000000..3dda7298 --- /dev/null +++ b/cmake/modules/.gitignore @@ -0,0 +1,2 @@ +Makefile.in +Makefile diff --git a/cmake/modules/Makefile.am b/cmake/modules/Makefile.am new file mode 100644 index 00000000..9b57cdfb --- /dev/null +++ b/cmake/modules/Makefile.am @@ -0,0 +1,7 @@ +MODULES = DuneIstlMacros.cmake \ + FindSuperLU.cmake + +modulesdir= $(datadir)/cmake/modules +modules_DATA = ${MODULES} + +include $(top_srcdir)/am/global-rules diff --git a/cmake/pkg/.gitignore b/cmake/pkg/.gitignore new file mode 100644 index 00000000..3dda7298 --- /dev/null +++ b/cmake/pkg/.gitignore @@ -0,0 +1,2 @@ +Makefile.in +Makefile diff --git a/cmake/pkg/Makefile.am b/cmake/pkg/Makefile.am new file mode 100644 index 00000000..e69de29b diff --git a/configure.ac b/configure.ac index 33cf3032..80cdc50b 100644 --- a/configure.ac +++ b/configure.ac @@ -18,6 +18,9 @@ AC_SUBST([AM_LDFLAGS], '$(DUNE_LDFLAGS) $(DUNE_LIBS)') # write output AC_CONFIG_FILES([Makefile + cmake/Makefile + cmake/modules/Makefile + cmake/pkg/Makefile doc/doxygen/Makefile doc/doxygen/Doxyfile doc/Makefile -- GitLab