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

    Apply use_libann.patch.

diff --git a/debian/control b/debian/control
index 2766da7..dec5c33 100644
--- a/debian/control
+++ b/debian/control
@@ -15,7 +15,7 @@ Build-Depends: debhelper (>= 8), cmake, gfortran, libgl1-mesa-dev,
  libblas-dev, liblapack-dev, libgl2ps-dev, freeglut3-dev,
  libpetsc3.1-dev [!kfreebsd-amd64 !kfreebsd-i386 !armel !mips !mipsel !s390 !sparc], 
  python-dev (>= 2.6.6-3~), swig2.0,
- chrpath
+ chrpath, libann-dev,
 Standards-Version: 3.9.2
 DM-Upload-Allowed: yes
 X-Python-Version: current
diff --git a/debian/patches/series b/debian/patches/series
index 552beed..3009824 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,3 +5,4 @@ delete_gl2ps_from_source.patch
 tetgen.patch
 mmg3d.patch
 use_gmm.patch
+use_libann.patch
diff --git a/debian/patches/use_libann.patch b/debian/patches/use_libann.patch
new file mode 100644
index 0000000..fd30b7b
--- /dev/null
+++ b/debian/patches/use_libann.patch
@@ -0,0 +1,30 @@
+Desctiption: use packaged version of libann instead of shipped with tarball
+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
+@@ -451,9 +451,19 @@
+ endif(HAVE_FLTK OR HAVE_QT OR ENABLE_GRAPHICS)
+ 
+ if(ENABLE_ANN)
+-  add_subdirectory(contrib/ANN)
+-  include_directories(contrib/ANN/include)
+-  set_config_option(HAVE_ANN "Ann")
++    find_library(ANN_LIB ann PATH_SUFFIXES lib)
++    if(ANN_LIB)
++      find_path(ANN_INC "ANN.h" PATH_SUFFIXES src include ANN)
++      if(ANN_INC)
++        list(APPEND EXTERNAL_LIBRARIES ${ANN_LIB})
++        list(APPEND EXTERNAL_INCLUDES ${ANN_INC})
++      endif(ANN_INC)
++    else(ANN_LIB)
++       message(STATUS "ANN " ${ANN_LIB} " not Found - using contrib/ann instead")
++       add_subdirectory(contrib/ANN)
++       include_directories(contrib/ANN/include)
++    endif(ANN_LIB)
++    set_config_option(HAVE_ANN "Ann")
+ endif(ENABLE_ANN)
+ 
+ if(ENABLE_BLOSSOM)

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