[SCM] Gmsh packaging. Gmsh is an automatic 3D finite element mesh generator. branch, master, updated. upstream/2.5.1_beta2_svn10875_dfsg-91-g5c3d744

[Anton Gladky]

The following commit has been merged in the master branch:
commit 52d38ceb5621f94f45730d626bea30ad024ad502
Author: Christophe Trophime <christophe.trophime at lncmi.cnrs.fr>
Date:   Mon Jan 16 22:34:25 2012 +0100

    Apply mmg3d.patch.

diff --git a/debian/patches/mmg3d.patch b/debian/patches/mmg3d.patch
new file mode 100644
index 0000000..6582461
--- /dev/null
+++ b/debian/patches/mmg3d.patch
@@ -0,0 +1,29 @@
+Desctiption: use packaged version of mmg3d instead of shipped with tarball,
+ when it appears in Debian. See #651438
+Author: Christophe Trophime <christophe.trophime at lncmi.cnrs.fr>
+Reviewed-by: Anton Gladky <gladky.anton at gmail.com>
+Last-Update: 2012-01-16
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -548,8 +548,18 @@
+   endif(ENABLE_BAMG)
+ 
+   if(ENABLE_MMG3D)
+-    add_subdirectory(contrib/mmg3d)
+-    include_directories(contrib/mmg3d/build/sources)
++    find_path(MMG3D_INC "libmmg3d.h" PATH_SUFFIXES src include)
++    if(MMG3D_INC)
++       list(APPEND EXTERNAL_INCLUDES ${MMG3D_INC})
++       find_library(MMG3D_LIB mmg3dlib4.0 PATH_SUFFIXES lib)
++       if(MMG3D_LIB)
++           list(APPEND EXTERNAL_LIBRARIES ${MMG3D_LIB})
++       endif(MMG3D_LIB)
++    else(MMG3D_INC)
++       message(STATUS "MMG3D " ${MMG3D_INC} " not Found - using contrib/mmg3d instead")
++       add_subdirectory(contrib/mmg3d)
++       include_directories(contrib/mmg3d/build/sources)
++    endif(NOT MMG3D_INC)
+     set_config_option(HAVE_MMG3D "Mmg3d")
+   endif(ENABLE_MMG3D)
+ 
diff --git a/debian/patches/series b/debian/patches/series
index db717f5..5e88cec 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@ skip_license_file.patch
 fix_spelling_errors.patch
 delete_gl2ps_from_source.patch
 tetgen.patch
+mmg3d.patch

-- 
Gmsh packaging. Gmsh is an automatic 3D finite element mesh generator.