[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 ae08657cbb21ee63055a3330fb830f682cdab12c
Author: Christophe Trophime <christophe.trophime at lncmi.cnrs.fr>
Date:   Mon Jan 16 22:37:03 2012 +0100

    Apply use_gmm.patch.

diff --git a/debian/patches/series b/debian/patches/series
index 5e88cec..552beed 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,3 +4,4 @@ fix_spelling_errors.patch
 delete_gl2ps_from_source.patch
 tetgen.patch
 mmg3d.patch
+use_gmm.patch
diff --git a/debian/patches/use_gmm.patch b/debian/patches/use_gmm.patch
index 9aa06d4..7f074bd 100644
--- a/debian/patches/use_gmm.patch
+++ b/debian/patches/use_gmm.patch
@@ -1,22 +1,23 @@
 Desctiption: use packaged version of gmm instead of shipped with tarball
- Patch needs to be applied, when getfem++ will be able to migrate to testing.
+ Patch will have an effect, when getfem++ will be able to migrate to testing.
  Requires BD on libgmm++-dev
 Author: Christophe Trophime <christophe.trophime at lncmi.cnrs.fr>
 Reviewed-by: Anton Gladky <gladky.anton at gmail.com>
-Last-Update: 2012-01-06
+Last-Update: 2012-01-16
 
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -481,8 +481,10 @@
+@@ -482,7 +482,12 @@
  endif(ENABLE_DINTEGRATION)
  
  if(ENABLE_GMM)
 -  include_directories(contrib/gmm)
--  set_config_option(HAVE_GMM "Gmm")
 +  find_path(GMM_INC "gmm.h" PATH_SUFFIXES src include include/gmm)
 +  if(GMM_INC)
 +    list(APPEND EXTERNAL_INCLUDES ${GMM_INC})
++  else(GMM_INC)
++    include_directories(contrib/gmm)
 +  endif(GMM_INC)
+   set_config_option(HAVE_GMM "Gmm")
  endif(ENABLE_GMM)
  
- if(ENABLE_KBIPACK)

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