[Dune-devel] [Dune-Commit] [Commit] dune-geometry - bd00cd7: [buildsystem] Distribute jacobian.mac.

[Markus Blatt]

Hi,

this patch leaves me a little puzzled. To me it seems like the
dune/geometry/quadraturerules/*.hh are created from the
dune/geometry/quadraturerules/*.mac files manually using maxima.
Therefore I would think, that we do not even have to include
jacobian.mac in the tarballs. 

Your patch now even installs jacobian.mac just like a header with
cmake (as opposed to the autotools). Would you care to tell us, why
this is needed?

Cheers,

Markus

On Sat, Apr 19, 2014 at 08:56:40AM +0200, Christoph Grüninger wrote:
> New commit, appeared at Sat Apr 19 08:56:40 2014 +0200
> as part of the following ref changes:
> 
>     branch refs/heads/master    updated from c4a4e1b -> bd00cd7
> 
> Browsable version: http://cgit.dune-project.org/repositories/dune-geometry/commit/?id=bd00cd71a127afd8d237a28995603b2c4662e104
> 
> ======================================================================
> 
> commit bd00cd71a127afd8d237a28995603b2c4662e104
> Author: Christoph Grüninger <gruenich at dune-project.org>
> Date:   Sat Apr 19 08:55:09 2014 +0200
> 
>     [buildsystem] Distribute jacobian.mac.
>     
>     Fix distribution of jacobian.mac for both autotools and CMake.
>     The file remains with the headers, maybe we should find a better
>     place then in includes.
> 
>  dune/geometry/quadraturerules/CMakeLists.txt | 4 +---
>  dune/geometry/quadraturerules/Makefile.am    | 6 +-----
>  2 files changed, 2 insertions(+), 8 deletions(-)
> 
> 
> 
> diff --git a/dune/geometry/quadraturerules/CMakeLists.txt b/dune/geometry/quadraturerules/CMakeLists.txt
> index 816b81e..e0fef8d 100644
> --- a/dune/geometry/quadraturerules/CMakeLists.txt
> +++ b/dune/geometry/quadraturerules/CMakeLists.txt
> @@ -7,6 +7,7 @@ install(FILES
>    gausslobatto_imp.hh
>    jacobi_1_0_imp.hh
>    jacobi_2_0_imp.hh
> +  jacobian.mac
>    DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dune/geometry/quadraturerules)
>  
>  exclude_from_headercheck(
> @@ -27,6 +28,3 @@ dune_add_library(quadraturerules OBJECT
>    quadraturerules.cc
>    gausslobatto.cc
>  )
> -
> -
> -message(AUTHOR_WARNING "TODO in dune-geometry/dune/geometry/quadraturerules: Distribute jacobian.mac")
> diff --git a/dune/geometry/quadraturerules/Makefile.am b/dune/geometry/quadraturerules/Makefile.am
> index 46407e2..7821a91 100644
> --- a/dune/geometry/quadraturerules/Makefile.am
> +++ b/dune/geometry/quadraturerules/Makefile.am
> @@ -1,5 +1,3 @@
> -# $Id: Makefile.am 2248 2006-02-10 15:30:52Z joe $
> -
>  quadraturerulesdir = $(includedir)/dune/geometry/quadraturerules
>  quadraturerules_HEADERS =		\
>  	compositequadraturerule.hh 	\
> @@ -26,8 +24,6 @@ libquadraturerules_la_SOURCES = quadraturerules.cc gauss.cc gausslobatto.cc jaco
>  libquadraturerules_la_LIBADD =	\
>  	$(DUNE_LIBS)
>  
> -extra_DIST=jacobian.mac
> +EXTRA_DIST = CMakeLists.txt jacobian.mac
>  
>  include $(top_srcdir)/am/global-rules
> -
> -EXTRA_DIST = CMakeLists.txt
> 
> _______________________________________________
> Dune-Commit mailing list
> Dune-Commit at dune-project.org
> http://lists.dune-project.org/mailman/listinfo/dune-commit

-- 
Do you need more support with DUNE or HPC in general? 

Dr. Markus Blatt - HPC-Simulation-Software & Services http://www.dr-blatt.de
Hans-Bunte-Str. 8-10, 69123 Heidelberg, Germany
Tel.: +49 (0) 160 97590858
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <https://lists.dune-project.org/pipermail/dune-devel/attachments/20140419/cc9bc09d/attachment.sig>