r44743 - in /packages/gmsh-tetgen/trunk/debian: ./ patches/ scripts/ source/
trophime-guest at users.alioth.debian.org
trophime-guest at users.alioth.debian.org
Fri Apr 27 07:09:04 UTC 2012
Author: trophime-guest
Date: Fri Apr 27 07:09:04 2012
New Revision: 44743
URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=44743
Log:
[svn-inject] Applying Debian modifications (2.5.1~beta2~svn11941-1) to trunk
Added:
packages/gmsh-tetgen/trunk/debian/ (with props)
packages/gmsh-tetgen/trunk/debian/README.Debian
packages/gmsh-tetgen/trunk/debian/README.source
packages/gmsh-tetgen/trunk/debian/TODO
packages/gmsh-tetgen/trunk/debian/changelog
packages/gmsh-tetgen/trunk/debian/compat
packages/gmsh-tetgen/trunk/debian/control
packages/gmsh-tetgen/trunk/debian/copyright
packages/gmsh-tetgen/trunk/debian/gmsh.desktop
packages/gmsh-tetgen/trunk/debian/gmsh.doc-base
packages/gmsh-tetgen/trunk/debian/gmsh.docs
packages/gmsh-tetgen/trunk/debian/gmsh.info
packages/gmsh-tetgen/trunk/debian/gmsh.install
packages/gmsh-tetgen/trunk/debian/gmsh.links
packages/gmsh-tetgen/trunk/debian/gmsh.lintian-overrides
packages/gmsh-tetgen/trunk/debian/gmsh.menu
packages/gmsh-tetgen/trunk/debian/gmsh.pyinstall
packages/gmsh-tetgen/trunk/debian/gmsh_16x16.xpm
packages/gmsh-tetgen/trunk/debian/gmsh_32x32.xpm
packages/gmsh-tetgen/trunk/debian/patches/
packages/gmsh-tetgen/trunk/debian/patches/Alauzet.patch
packages/gmsh-tetgen/trunk/debian/patches/add-missing-headers.patch
packages/gmsh-tetgen/trunk/debian/patches/api_demos.patch
packages/gmsh-tetgen/trunk/debian/patches/cgns.patch
packages/gmsh-tetgen/trunk/debian/patches/change_shared_library_name.patch
packages/gmsh-tetgen/trunk/debian/patches/delete_gl2ps_from_source.patch
packages/gmsh-tetgen/trunk/debian/patches/fix_FTBFS_linking.patch
packages/gmsh-tetgen/trunk/debian/patches/fix_spelling_errors.patch
packages/gmsh-tetgen/trunk/debian/patches/metis.patch
packages/gmsh-tetgen/trunk/debian/patches/series
packages/gmsh-tetgen/trunk/debian/patches/skip_license_file.patch
packages/gmsh-tetgen/trunk/debian/patches/switch_from_opencascade_to_oce.patch
packages/gmsh-tetgen/trunk/debian/patches/tetgen-1.4.3.patch
packages/gmsh-tetgen/trunk/debian/postinst
packages/gmsh-tetgen/trunk/debian/postrm
packages/gmsh-tetgen/trunk/debian/rules (with props)
packages/gmsh-tetgen/trunk/debian/scripts/
packages/gmsh-tetgen/trunk/debian/scripts/get_orig.py (with props)
packages/gmsh-tetgen/trunk/debian/source/
packages/gmsh-tetgen/trunk/debian/source/format
packages/gmsh-tetgen/trunk/debian/watch
Propchange: packages/gmsh-tetgen/trunk/debian/
------------------------------------------------------------------------------
mergeWithUpstream = 1
Added: packages/gmsh-tetgen/trunk/debian/README.Debian
URL: http://svn.debian.org/wsvn/debian-science/packages/gmsh-tetgen/trunk/debian/README.Debian?rev=44743&op=file
==============================================================================
--- packages/gmsh-tetgen/trunk/debian/README.Debian (added)
+++ packages/gmsh-tetgen/trunk/debian/README.Debian Fri Apr 27 07:09:04 2012
@@ -1,0 +1,65 @@
+gmsh for Debian
+---------------
+
+Gmsh is an academic 3D mesh generator with a simple enough interface.
+
+* Documentation
+---------------
+
+** GMSH reference manual
+------------------------
+
+The documentation is available in several formats
+
+[PDF]
+/usr/share/doc/gmsh/gmsh.pdf.gz
+
+[Html]
+/usr/share/doc/gmsh/html/gmsh.html
+
+** FAQ
+------
+
+A FAQ is also available here
+
+/usr/share/doc/gmsh/FAQ
+
+* Tutorials and Demos
+---------------------
+
+A tutorial is available in /usr/share/doc/gmsh/tutorial.
+A few demos are available in /usr/share/doc/gmsh/demos.
+
+* Solvers
+---------
+If you want to have examples on plugin your own solver to gmsh
+have a look at the following two solvers ( C and perl )
+
+/usr/share/doc/gmsh/utils/solvers
+
+* Converters
+------------
+
+You can find some converters from (autocad|maya|matlab) to gmsh format
+in
+
+/usr/share/doc/gmsh/utils/converters
+
+ -- Christophe Prud'homme <prudhomm at debian.org>, Wed Nov 17 09:17:28 2004
+
+* Python-binding
+------------
+
+Using python-interface is experimental and requires workaround:
+export LD_PRELOAD=/usr/lib/libmpi.so
+
+ -- Anton Gladky <gladky.anton at gmail.com>, Thu Jan 05 21:57:02 2012
+
+* Compiling api_demos
+------------
+
+to build api_demos go into the newly created directory:
+cmake ../../../gmsh/utils/api_demos -DCMAKE_CXX_FLAGS="-DMPICH_SKIP_MPICXX -DOMPI_SKIP_MPICXX -fopenmp -lgl2ps -lGL -lglut" -DCMAKE_INCLUDE_PATH:="/usr/include/mpi;/usr/include/gmsh" -DCMAKE_VERBOSE_MAKEFILE=ON
+
+ -- Christophe Trophime <christophe.trophime at lncmi.cnrs.fr>, Mon Mar 12 18:30:00 2012
+
Added: packages/gmsh-tetgen/trunk/debian/README.source
URL: http://svn.debian.org/wsvn/debian-science/packages/gmsh-tetgen/trunk/debian/README.source?rev=44743&op=file
==============================================================================
--- packages/gmsh-tetgen/trunk/debian/README.source (added)
+++ packages/gmsh-tetgen/trunk/debian/README.source Fri Apr 27 07:09:04 2012
@@ -1,0 +1,15 @@
+# -*- mode: readme-debian -*-
+
+
+Removing Metis support
+----------------------
+
+The sources of Gmsh contain Metis, a non-free library, as a module
+that can be disabled. To keep Gmsh clean, its sources are modified and
+Metis has been removed from contrib/Metis.
+The steps are documented in debian/rules in the get-orig-source rule.
+
+Also a quilt patch (see debian/patches) is available to fix a
+compilation issue when using --disable-metis
+
+ -- Christophe Prud'homme <prudhomm at debian.org>, Sat, 1 Nov 2008 08:34:47 +0100
Added: packages/gmsh-tetgen/trunk/debian/TODO
URL: http://svn.debian.org/wsvn/debian-science/packages/gmsh-tetgen/trunk/debian/TODO?rev=44743&op=file
==============================================================================
--- packages/gmsh-tetgen/trunk/debian/TODO (added)
+++ packages/gmsh-tetgen/trunk/debian/TODO Fri Apr 27 07:09:04 2012
@@ -1,0 +1,1 @@
+Return libpetsc to BD
Added: packages/gmsh-tetgen/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/gmsh-tetgen/trunk/debian/changelog?rev=44743&op=file
==============================================================================
--- packages/gmsh-tetgen/trunk/debian/changelog (added)
+++ packages/gmsh-tetgen/trunk/debian/changelog Fri Apr 27 07:09:04 2012
@@ -1,0 +1,8 @@
+gmsh-tetgen (2.5.1~beta2~svn11941-1) unstable; urgency=low
+
+ * update to latest gmsh rev
+ * add tetgen support
+
+ * Initial release (Closes: #502615)
+
+ -- Christophe Trophime <christophe.trophime at lncmi.cnrs.fr> Sat, 14 Apr 2012 12:00:42 +0200
Added: packages/gmsh-tetgen/trunk/debian/compat
URL: http://svn.debian.org/wsvn/debian-science/packages/gmsh-tetgen/trunk/debian/compat?rev=44743&op=file
==============================================================================
--- packages/gmsh-tetgen/trunk/debian/compat (added)
+++ packages/gmsh-tetgen/trunk/debian/compat Fri Apr 27 07:09:04 2012
@@ -1,0 +1,1 @@
+8
Added: packages/gmsh-tetgen/trunk/debian/control
URL: http://svn.debian.org/wsvn/debian-science/packages/gmsh-tetgen/trunk/debian/control?rev=44743&op=file
==============================================================================
--- packages/gmsh-tetgen/trunk/debian/control (added)
+++ packages/gmsh-tetgen/trunk/debian/control Fri Apr 27 07:09:04 2012
@@ -1,0 +1,50 @@
+Source: gmsh-tetgen
+Section: non-free/math
+Priority: optional
+Maintainer: Debian Science Maintainers <debian-science-maintainers at lists.alioth.debian.org>
+Uploaders: Christophe Prud'homme <prudhomm at debian.org>,
+ Anton Gladky <gladky.anton at gmail.com>,
+ Christophe Trophime <christophe.trophime at lncmi.cnrs.fr>
+Build-Depends: debhelper (>= 8), cmake, gfortran, libgl1-mesa-dev,
+ libglu1-mesa-dev, libfltk1.3-dev (>=1.1.7),
+ libpng-dev, libjpeg-dev, zlib1g-dev, texlive, texinfo,
+ mpi-default-dev,
+ libgmm++-dev [!hurd-i386 !s390x],
+ liboce-modeling-dev, liboce-visualization-dev, liboce-ocaf-dev, oce-draw,
+ libcgns-dev (>= 3.1.3.2),
+ libmed-dev (>= 2.3.6), libmedc-dev (>= 2.3.6),
+ libhdf5-mpi-dev (>= 1.8.8) [alpha amd64 i386 ia64 kfreebsd-amd64 kfreebsd-i386 powerpc sparc],
+ libblas-dev, liblapack-dev, libgl2ps-dev, freeglut3-dev,
+ python-dev (>= 2.6.6-3~), swig,
+ chrpath, libann-dev,
+ libpetsc3.2-dev [!kfreebsd-amd64 !kfreebsd-i386 !armel !armhf !s390x],
+ libslepc3.2-dev [!kfreebsd-amd64 !kfreebsd-i386 !armel !armhf !s390x]
+Standards-Version: 3.9.3
+DM-Upload-Allowed: yes
+X-Python-Version: >= 2.7, << 2.8
+Vcs-Git: git://git.debian.org/git/debian-science/packages/gmsh.git
+Vcs-Browser: http://git.debian.org/?p=debian-science/packages/gmsh.git
+Homepage: http://www.geuz.org/gmsh/
+
+Package: gmsh-tetgen
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}, mpi-default-bin,
+ python (>= 2.7), python (<<2.8)
+Replaces: gmsh
+Provides: gmsh
+Description: Three-dimensional finite element mesh generator
+ Gmsh is an automatic 3D finite element mesh generator (primarily
+ Delaunay) with build-in CAD and post-processing facilities. Its
+ design goal is to provide a simple meshing tool for academic test
+ cases with parametric input and up to date visualization
+ capabilities.
+ .
+ Gmsh is built around four modules: geometry, mesh, solver and
+ post-processing. The specification of any input to these modules is
+ done either interactively using the graphical user interface or in
+ ASCII text files using Gmsh's own scripting language.
+ .
+ See Gmsh's reference manual for a more thorough overview of Gmsh's
+ capabilities.
+ .
+ This version is build with tetgen 1.5 and metis
Added: packages/gmsh-tetgen/trunk/debian/copyright
URL: http://svn.debian.org/wsvn/debian-science/packages/gmsh-tetgen/trunk/debian/copyright?rev=44743&op=file
==============================================================================
--- packages/gmsh-tetgen/trunk/debian/copyright (added)
+++ packages/gmsh-tetgen/trunk/debian/copyright Fri Apr 27 07:09:04 2012
@@ -1,0 +1,130 @@
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Source: http://www.geuz.org/gmsh/
+
+Files: *
+Copyright: 1997-2012 Christophe Geuzaine <geuzaine at acm.caltech.edu>
+ Jean-Francois Remacle <remacle at gce.ucl.ac.be>
+License: GPL-2+, with the following exception:
+ The copyright holders of Gmsh give you permission to combine Gmsh
+ with code included in the standard release of TetGen (from Hang Si),
+ Netgen (from Joachim Sch"oberl), Chaco (from Bruce Hendrickson and
+ Robert Leland at Sandia National Laboratories) and METIS (from
+ George Karypis at the University of Minnesota) under their
+ respective licenses. You may copy and distribute such a system
+ following the terms of the GNU GPL for Gmsh and the licenses of the
+ other code concerned, provided that you include the source code of
+ that other code when and as the GNU GPL requires distribution of
+ source code.
+ .
+ Note that people who make modified versions of Gmsh are not
+ obligated to grant this special exception for their modified
+ versions; it is their choice whether to do so. The GNU General
+ Public License gives permission to release a modified version
+ without this exception; this exception also makes it possible to
+ release a modified version which carries forward this exception.
+ .
+ End of exception.
+ .
+ This program is free software; you can redistribute it
+ and/or modify it under the terms of the GNU General Public
+ License as published by the Free Software Foundation; either
+ version 2 of the License, or any later version.
+ .
+ This program is distributed in the hope that it will be
+ useful, but WITHOUT ANY WARRANTY; without even the implied
+ warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ PURPOSE. See the GNU General Public License for more
+ details.
+ .
+ You should have received a copy of the GNU General Public
+ License along with this package; if not, write to the Free
+ Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+ Boston, MA 02110-1301 USA
+ .
+ On Debian systems, the full text of the GNU General Public
+ License version 2 can be found in the file
+ `/usr/share/common-licenses/GPL-2'.
+
+Files: contrib/Chaco/*
+Copyright: 1997-2011 Sandia Corporation
+License: LGPL-2.1
+ This software was developed by Bruce Hendrickson and Robert Leland
+ at Sandia National Laboratories under US Department of Energy
+ contract DE-AC04-76DP00789 and is copyrighted by Sandia Corporation.
+ .
+ Chaco has been slightly modified for integration into the Gmsh program. Most
+ changes are to 'main/interface.c'. Elsewhere, the 'printf' routine has been
+ defined as Gmsh_printf to write through a Gmsh Msg::Info. All other
+ modifications are tagged by 'Gmsh' and 'Gmsh - end'
+ .
+ On Debian systems, the full text of the GNU LESSER GENERAL PUBLIC
+ LICENSE version 2.1 can be found in the file
+ `/usr/share/common-licenses/LGPL-2.1'.
+
+Files: contrib/Netgen/*
+Copyright: 1997-2011 Dr. Joachim Schöberl <js at jku.at>
+License: LGPL-2.1
+ On Debian systems, the full text of the GNU LESSER GENERAL PUBLIC
+ LICENSE version 2.1 can be found in the file
+ `/usr/share/common-licenses/LGPL-2.1'.
+
+Files: contrib/blossom/*
+Copyright: 1997-2011 Prof. Cook <bico at isye.gatech.edu>
+License: other
+ Free to use for both academic and non-academic work.
+ Concorde license is granted only for use within the Gmsh system.
+ .
+ For more informatoin, please, refer contrib/blossom/README.txt
+
+Files: contrib/voro++/*
+Copyright: 2008 The Regents of the University of California
+License: other
+ Voro++ Copyright (c) 2008, The Regents of the University of California, through
+ Lawrence Berkeley National Laboratory (subject to receipt of any required
+ approvals from the U.S. Dept. of Energy). All rights reserved.
+ .
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are met:
+ .
+ (1) Redistributions of source code must retain the above copyright notice, this
+ list of conditions and the following disclaimer.
+ .
+ (2) Redistributions in binary form must reproduce the above copyright notice,
+ this list of conditions and the following disclaimer in the documentation
+ and/or other materials provided with the distribution.
+ .
+ (3) Neither the name of the University of California, Lawrence Berkeley
+ National Laboratory, U.S. Dept. of Energy nor the names of its contributors may
+ be used to endorse or promote products derived from this software without
+ specific prior written permission.
+ .
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ .
+ You are under no obligation whatsoever to provide any bug fixes, patches, or
+ upgrades to the features, functionality or performance of the source code
+ ("Enhancements") to anyone; however, if you choose to make your Enhancements
+ available either publicly, or directly to Lawrence Berkeley National
+ Laboratory, without imposing a separate written license agreement for such
+ Enhancements, then you hereby grant the following license: a non-exclusive,
+ royalty-free perpetual license to install, use, modify, prepare derivative
+ works, incorporate into other computer software, distribute, and sublicense
+ such enhancements or derivative works thereof, in binary and source code form.
+
+Files: contrib/rtree/*
+Copyright: 1983 Antonin Guttman, UC Berkely
+ 1983 Michael Stonebraker, UC Berkely
+ 1994 Melinda Green <melinda at superliminal.com>
+ 1995 Paul Brook
+ 2004 Greg Douglas
+License: other
+ contrib/rtree/README says:
+ Entirely free for all uses.
Added: packages/gmsh-tetgen/trunk/debian/gmsh.desktop
URL: http://svn.debian.org/wsvn/debian-science/packages/gmsh-tetgen/trunk/debian/gmsh.desktop?rev=44743&op=file
==============================================================================
--- packages/gmsh-tetgen/trunk/debian/gmsh.desktop (added)
+++ packages/gmsh-tetgen/trunk/debian/gmsh.desktop Fri Apr 27 07:09:04 2012
@@ -1,0 +1,10 @@
+[Desktop Entry]
+Version=1.0
+Name=Gmsh Mesh Generator
+GenericName=Gmsh
+Comment=3-D finite element mesh generator
+Exec=gmsh
+Icon=/usr/share/pixmaps/gmsh_32x32.xpm
+Type=Application
+Terminal=false
+Categories=Education;Math;Science;
Added: packages/gmsh-tetgen/trunk/debian/gmsh.doc-base
URL: http://svn.debian.org/wsvn/debian-science/packages/gmsh-tetgen/trunk/debian/gmsh.doc-base?rev=44743&op=file
==============================================================================
--- packages/gmsh-tetgen/trunk/debian/gmsh.doc-base (added)
+++ packages/gmsh-tetgen/trunk/debian/gmsh.doc-base Fri Apr 27 07:09:04 2012
@@ -1,0 +1,12 @@
+Document: gmsh
+Title: Gmsh Reference Manual
+Author: Christophe Geuzaine and Jean-François Remacle
+Abstract: This is the reference manual for gmsh.
+Section: Science/Mathematics
+
+Format: pdf
+Files: /usr/share/doc/gmsh/gmsh.pdf.gz
+
+Format: HTML
+Index: /usr/share/doc/gmsh/gmsh.html
+Files: /usr/share/doc/gmsh/gmsh.html
Added: packages/gmsh-tetgen/trunk/debian/gmsh.docs
URL: http://svn.debian.org/wsvn/debian-science/packages/gmsh-tetgen/trunk/debian/gmsh.docs?rev=44743&op=file
==============================================================================
--- packages/gmsh-tetgen/trunk/debian/gmsh.docs (added)
+++ packages/gmsh-tetgen/trunk/debian/gmsh.docs Fri Apr 27 07:09:04 2012
@@ -1,0 +1,3 @@
+utils/converters
+utils/solvers
+utils/api_demos
Added: packages/gmsh-tetgen/trunk/debian/gmsh.info
URL: http://svn.debian.org/wsvn/debian-science/packages/gmsh-tetgen/trunk/debian/gmsh.info?rev=44743&op=file
==============================================================================
--- packages/gmsh-tetgen/trunk/debian/gmsh.info (added)
+++ packages/gmsh-tetgen/trunk/debian/gmsh.info Fri Apr 27 07:09:04 2012
@@ -1,0 +1,1 @@
+doc/texinfo/gmsh.info
Added: packages/gmsh-tetgen/trunk/debian/gmsh.install
URL: http://svn.debian.org/wsvn/debian-science/packages/gmsh-tetgen/trunk/debian/gmsh.install?rev=44743&op=file
==============================================================================
--- packages/gmsh-tetgen/trunk/debian/gmsh.install (added)
+++ packages/gmsh-tetgen/trunk/debian/gmsh.install Fri Apr 27 07:09:04 2012
@@ -1,0 +1,18 @@
+debian/*.xpm /usr/share/pixmaps
+debian/gmsh.desktop /usr/share/applications
+#The following files are for compiling api_demos
+Common/Gmsh.h /usr/include/gmsh
+Geo/Chain.h /usr/include/gmsh
+Graphics/Camera.h /usr/include/gmsh
+Graphics/Trackball.h /usr/include/gmsh
+Solver/functionSpace.h /usr/include/gmsh
+Solver/STensor43.h /usr/include/gmsh
+Solver/STensor33.h /usr/include/gmsh
+Common/OS.h /usr/include/gmsh
+Common/Options.h /usr/include/gmsh
+Post/ColorTable.h /usr/include/gmsh
+Post/PViewOptions.h /usr/include/gmsh
+Common/OpenFile.h /usr/include/gmsh
+Common/StringUtils.h /usr/include/gmsh
+Mesh/Field.h /usr/include/gmsh
+Post/PViewData.h /usr/include/gmsh
Added: packages/gmsh-tetgen/trunk/debian/gmsh.links
URL: http://svn.debian.org/wsvn/debian-science/packages/gmsh-tetgen/trunk/debian/gmsh.links?rev=44743&op=file
==============================================================================
--- packages/gmsh-tetgen/trunk/debian/gmsh.links (added)
+++ packages/gmsh-tetgen/trunk/debian/gmsh.links Fri Apr 27 07:09:04 2012
@@ -1,0 +1,1 @@
+/usr/lib/libgmsh.so /usr/lib/libgmsh.so.2.5.1
Added: packages/gmsh-tetgen/trunk/debian/gmsh.lintian-overrides
URL: http://svn.debian.org/wsvn/debian-science/packages/gmsh-tetgen/trunk/debian/gmsh.lintian-overrides?rev=44743&op=file
==============================================================================
--- packages/gmsh-tetgen/trunk/debian/gmsh.lintian-overrides (added)
+++ packages/gmsh-tetgen/trunk/debian/gmsh.lintian-overrides Fri Apr 27 07:09:04 2012
@@ -1,0 +1,3 @@
+gmsh: package-name-doesnt-match-sonames libgmsh-2.5.1
+gmsh: extra-license-file usr/share/doc/gmsh/converters/stl_to_cartesian/LICENCE.txt
+#It is not a license file, just a link on topic of forum, where it was published
Added: packages/gmsh-tetgen/trunk/debian/gmsh.menu
URL: http://svn.debian.org/wsvn/debian-science/packages/gmsh-tetgen/trunk/debian/gmsh.menu?rev=44743&op=file
==============================================================================
--- packages/gmsh-tetgen/trunk/debian/gmsh.menu (added)
+++ packages/gmsh-tetgen/trunk/debian/gmsh.menu Fri Apr 27 07:09:04 2012
@@ -1,0 +1,8 @@
+?package(gmsh): \
+ needs="X11" \
+ section="Applications/Science/Engineering" \
+ title="Gmsh" \
+ command="/usr/bin/gmsh" \
+ icon="/usr/share/pixmaps/gmsh_32x32.xpm" \
+ icon16x16="/usr/share/pixmaps/gmsh_16x16.xpm" \
+ icon32x32="/usr/share/pixmaps/gmsh_32x32.xpm"
Added: packages/gmsh-tetgen/trunk/debian/gmsh.pyinstall
URL: http://svn.debian.org/wsvn/debian-science/packages/gmsh-tetgen/trunk/debian/gmsh.pyinstall?rev=44743&op=file
==============================================================================
--- packages/gmsh-tetgen/trunk/debian/gmsh.pyinstall (added)
+++ packages/gmsh-tetgen/trunk/debian/gmsh.pyinstall Fri Apr 27 07:09:04 2012
@@ -1,0 +1,2 @@
+debian/build/wrappers/gmshpy/*.so gmshpy
+debian/build/wrappers/gmshpy/*.py gmshpy
Added: packages/gmsh-tetgen/trunk/debian/gmsh_16x16.xpm
URL: http://svn.debian.org/wsvn/debian-science/packages/gmsh-tetgen/trunk/debian/gmsh_16x16.xpm?rev=44743&op=file
==============================================================================
--- packages/gmsh-tetgen/trunk/debian/gmsh_16x16.xpm (added)
+++ packages/gmsh-tetgen/trunk/debian/gmsh_16x16.xpm Fri Apr 27 07:09:04 2012
@@ -1,0 +1,72 @@
+/* XPM */
+static char * gmsh_16x16_xpm[] = {
+"16 16 53 1",
+" c None",
+". c #C8C8C8",
+"+ c #000000",
+"@ c #D5D5D5",
+"# c #E8E8E8",
+"$ c #D6D6D6",
+"% c #F2F2F2",
+"& c #D7D7D7",
+"* c #EAEAEA",
+"= c #F4F4F4",
+"- c #D9D9D9",
+"; c #F6F6F6",
+"> c #DADADA",
+", c #EBEBEB",
+"' c #F5F5F5",
+") c #F8F8F8",
+"! c #DCDCDC",
+"~ c #DFDFDF",
+"{ c #F7F7F7",
+"] c #F9F9F9",
+"^ c #EEEEEE",
+"/ c #FAFAFA",
+"( c #DEDEDE",
+"_ c #E5E5E5",
+": c #FCFCFC",
+"< c #F0F0F0",
+"[ c #C4C4C4",
+"} c #202020",
+"| c #060606",
+"1 c #E6E6E6",
+"2 c #F1F1F1",
+"3 c #B5B5B5",
+"4 c #919191",
+"5 c #757575",
+"6 c #6F6F6F",
+"7 c #6C6C6C",
+"8 c #646464",
+"9 c #4A4A4A",
+"0 c #2C2C2C",
+"a c #141414",
+"b c #020202",
+"c c #464646",
+"d c #373737",
+"e c #353535",
+"f c #343434",
+"g c #323232",
+"h c #313131",
+"i c #303030",
+"j c #2E2E2E",
+"k c #2B2B2B",
+"l c #2A2A2A",
+"m c #222222",
+"n c #0A0A0A",
+" ",
+" ",
+" .+ ",
+" @++ ",
+" #$++ ",
+" %&+++ ",
+" *=-+++ ",
+" %;>++++ ",
+" ,')!++++ ",
+" ~={]!+++++ ",
+" ^;)/(++++++ ",
+" _')/:~++++++ ",
+" <)//=[}|+++++ ",
+" 12$34567890ab+ ",
+" cdefghij0klmn+",
+" "};
Added: packages/gmsh-tetgen/trunk/debian/gmsh_32x32.xpm
URL: http://svn.debian.org/wsvn/debian-science/packages/gmsh-tetgen/trunk/debian/gmsh_32x32.xpm?rev=44743&op=file
==============================================================================
--- packages/gmsh-tetgen/trunk/debian/gmsh_32x32.xpm (added)
+++ packages/gmsh-tetgen/trunk/debian/gmsh_32x32.xpm Fri Apr 27 07:09:04 2012
@@ -1,0 +1,144 @@
+/* XPM */
+static char * gmsh_32x32_xpm[] = {
+"32 32 109 2",
+" c None",
+". c #999999",
+"+ c #000000",
+"@ c #D2D2D2",
+"# c #B2B2B2",
+"$ c #E3E3E3",
+"% c #B9B9B9",
+"& c #CECECE",
+"* c #F0F0F0",
+"= c #BABABA",
+"- c #DEDEDE",
+"; c #F1F1F1",
+"> c #D4D4D4",
+", c #EDEDED",
+"' c #F2F2F2",
+") c #E6E6E6",
+"! c #D5D5D5",
+"~ c #F3F3F3",
+"{ c #E0E0E0",
+"] c #F4F4F4",
+"^ c #BBBBBB",
+"/ c #D9D9D9",
+"( c #EFEFEF",
+"_ c #F5F5F5",
+": c #BCBCBC",
+"< c #EAEAEA",
+"[ c #F6F6F6",
+"} c #F7F7F7",
+"| c #BDBDBD",
+"1 c #F8F8F8",
+"2 c #DADADA",
+"3 c #F9F9F9",
+"4 c #BEBEBE",
+"5 c #EBEBEB",
+"6 c #FAFAFA",
+"7 c #E2E2E2",
+"8 c #FBFBFB",
+"9 c #DCDCDC",
+"0 c #FCFCFC",
+"a c #BFBFBF",
+"b c #FDFDFD",
+"c c #C0C0C0",
+"d c #E8E8E8",
+"e c #FEFEFE",
+"f c #E1E1E1",
+"g c #060606",
+"h c #010101",
+"i c #C3C3C3",
+"j c #979797",
+"k c #464646",
+"l c #313131",
+"m c #121212",
+"n c #040404",
+"o c #DBDBDB",
+"p c #D7D7D7",
+"q c #A1A1A1",
+"r c #808080",
+"s c #787878",
+"t c #747474",
+"u c #737373",
+"v c #717171",
+"w c #707070",
+"x c #696969",
+"y c #5D5D5D",
+"z c #414141",
+"A c #2C2C2C",
+"B c #151515",
+"C c #0D0D0D",
+"D c #E9E9E9",
+"E c #E7E7E7",
+"F c #C2C2C2",
+"G c #ADADAD",
+"H c #949494",
+"I c #848484",
+"J c #767676",
+"K c #727272",
+"L c #6F6F6F",
+"M c #6E6E6E",
+"N c #6B6B6B",
+"O c #686868",
+"P c #676767",
+"Q c #656565",
+"R c #636363",
+"S c #606060",
+"T c #5B5B5B",
+"U c #4D4D4D",
+"V c #434343",
+"W c #2F2F2F",
+"X c #1C1C1C",
+"Y c #080808",
+"Z c #B7B7B7",
+"` c #9C9C9C",
+" . c #565656",
+".. c #545454",
+"+. c #535353",
+"@. c #525252",
+"#. c #515151",
+"$. c #4F4F4F",
+"%. c #4C4C4C",
+"&. c #4A4A4A",
+"*. c #494949",
+"=. c #484848",
+"-. c #474747",
+";. c #454545",
+">. c #444444",
+",. c #424242",
+"'. c #404040",
+"). c #393939",
+"!. c #050505",
+" ",
+" ",
+" ",
+" . + ",
+" @ # + ",
+" $ % + + ",
+" & * = + + ",
+" - ; = + + + ",
+" > , ' = + + + + ",
+" ) ; ' = + + + + ",
+" ! ; ' ~ = + + + + + ",
+" { ; ~ ] ^ + + + + + ",
+" / ( ~ ] _ : + + + + + + ",
+" < ' ~ ] [ : + + + + + + ",
+" ! ; ~ ] [ } | + + + + + + + ",
+" { ' ~ [ [ 1 | + + + + + + + ",
+" 2 ; ] _ } 1 3 4 + + + + + + + + ",
+" 5 ' ] [ } 1 3 4 + + + + + + + + ",
+" > ' ] [ } 1 3 6 4 + + + + + + + + + ",
+" 7 ] _ } } 3 3 8 4 + + + + + + + + + ",
+" 9 ' _ [ 1 1 6 6 0 a + + + + + + + + + + ",
+" , ] [ } 1 3 6 8 0 a + + + + + + + + + + ",
+" 2 ] _ } 1 3 6 8 0 b c + + + + + + + + + + + ",
+" d _ [ 1 1 6 6 0 0 e c + + + + + + + + + + + ",
+" f ] } 1 3 6 6 8 0 b 0 : g h + + + + + + + + + + ",
+" ; _ } 1 3 6 6 8 ] 7 i j k l m n + + + + + + + + ",
+" o _ [ [ ' ) p : q r s t u v w x y z A B C n h + + + ",
+" D ~ E F G H I J K L M N N O P Q R S T U V W X Y h + + ",
+" Z ` L T . ...+. at .#.$.U U %.&.*.=.-.;.>.>.,.z '.).A B !. ",
+" ",
+" ",
+" "};
Added: packages/gmsh-tetgen/trunk/debian/patches/Alauzet.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/gmsh-tetgen/trunk/debian/patches/Alauzet.patch?rev=44743&op=file
==============================================================================
--- packages/gmsh-tetgen/trunk/debian/patches/Alauzet.patch (added)
+++ packages/gmsh-tetgen/trunk/debian/patches/Alauzet.patch Fri Apr 27 07:09:04 2012
@@ -1,0 +1,298 @@
+Index: gmsh-2.5.1~beta2~svn11871~dfsg/Mesh/BackgroundMesh.cpp
+===================================================================
+--- gmsh-2.5.1~beta2~svn11871~dfsg.orig/Mesh/BackgroundMesh.cpp (révision 11871)
++++ gmsh-2.5.1~beta2~svn11871~dfsg/Mesh/BackgroundMesh.cpp (copie de travail)
+@@ -397,6 +397,7 @@
+ double U, double V,
+ double X, double Y, double Z)
+ {
++ std::cout << "BGM\n";
+ // default lc (mesh size == size of the model)
+ double l1 = CTX::instance()->lc;
+ const double max_lc = CTX::instance()->mesh.lcMax;
+@@ -414,11 +415,15 @@
+ // lc from fields
+ SMetric3 l4(1./(max_lc*max_lc));
+ FieldManager *fields = ge->model()->getFields();
++ //std::cout << "backgroundfield=" << fields->getBackgroundField() << "\n";
+ if(fields->getBackgroundField() > 0){
+ Field *f = fields->get(fields->getBackgroundField());
++ //std::cout << "isotropic=" << f->isotropic() << "\n";
+ if(f){
++ //std::cout << "isotropic=" << f->isotropic() << "\n";
+ if (!f->isotropic()){
+ (*f)(X, Y, Z, l4,ge);
++ //printf("l=[%g %g %g %g %g %g]\n",l4(0,0),l4(1,1),l4(2,2),l4(0,1),l4(0,2),l4(1,2));
+ /*
+ if (ge->tag() == 3){
+ printf("X = %12.5E , l4 = %12.5E %12.5E %12.5E l2 = %12.5E\n",X,l4(0,0),l4(1,1),l4(0,1),l2);
+@@ -445,7 +450,7 @@
+
+ SMetric3 LC(1./(lc*lc));
+ SMetric3 m = intersection_conserveM1(intersection_conserveM1 (l4, LC),l3);
+- //printf("%g %g %g %g %g %g\n",m(0,0),m(1,1),m(2,2),m(0,1),m(0,2),m(1,2));
++ //printf("m=[%g %g %g %g %g %g]\n",m(0,0),m(1,1),m(2,2),m(0,1),m(0,2),m(1,2));
+ {
+ fullMatrix<double> V(3,3);
+ fullVector<double> S(3);
+Index: gmsh-2.5.1~beta2~svn11871~dfsg/Mesh/Field.cpp
+===================================================================
+--- gmsh-2.5.1~beta2~svn11871~dfsg.orig/Mesh/Field.cpp (révision 11871)
++++ gmsh-2.5.1~beta2~svn11871~dfsg/Mesh/Field.cpp (copie de travail)
+@@ -467,6 +467,55 @@
+ }
+ };
+
++class SphereField : public Field
++{
++ double v_in, v_out;
++ double xc,yc,zc;
++ double R;
++
++ public:
++ std::string getDescription()
++ {
++ return "The value of this field is VIn inside a sphere, VOut outside. "
++ "The sphere is given by\n\n"
++ " ||dX||^2 < R^2 &&\n"
++ " dX = (X - XC)^2 + (Y-YC)^2 + (Z-ZC)^2";
++ }
++ SphereField()
++ {
++ v_in = v_out = xc = yc = zc = R = 0;
++
++ options["VIn"] = new FieldOptionDouble
++ (v_in, "Value inside the sphere");
++ options["VOut"] = new FieldOptionDouble
++ (v_out, "Value outside the sphere");
++
++ options["XCenter"] = new FieldOptionDouble
++ (xc, "X coordinate of the sphere center");
++ options["YCenter"] = new FieldOptionDouble
++ (yc, "Y coordinate of the sphere center");
++ options["ZCenter"] = new FieldOptionDouble
++ (zc, "Z coordinate of the sphere center");
++
++
++ options["Radius"] = new FieldOptionDouble
++ (R,"Radius");
++
++ }
++ const char *getName()
++ {
++ return "Sphere";
++ }
++ double operator() (double x, double y, double z, GEntity *ge=0)
++ {
++ double dx = x-xc;
++ double dy = y-yc;
++ double dz = z-zc;
++
++ return ( (dx*dx + dy*dy + dz*dz < R*R) ) ? v_in : v_out;
++ }
++};
++
+ class FrustumField : public Field
+ {
+ double x1,y1,z1;
+@@ -1268,17 +1317,21 @@
+ }
+ virtual void operator() (double x, double y, double z, SMetric3 &metr, GEntity *ge=0)
+ {
++ std::cout << "MinAnisoField idlist=" << idlist.size() << "\n";
+ SMetric3 v (1./MAX_LC);
+ for(std::list<int>::iterator it = idlist.begin(); it != idlist.end(); it++) {
+ Field *f = (GModel::current()->getFields()->get(*it));
++ std::cout << "Field[" << *it << "]\n";
+ SMetric3 ff;
+ if(f && *it != id) {
+ if (f->isotropic()){
+ double l = (*f) (x, y, z, ge);
+ ff = SMetric3(1./(l*l));
++ //printf("ff=[%g %g %g %g %g %g]\n",ff(0,0),ff(1,1),ff(2,2),ff(0,1),ff(0,2),ff(1,2));
+ }
+ else{
+ (*f) (x, y, z, ff, ge);
++ //printf("ff_iso=[%g %g %g %g %g %g]\n",ff(0,0),ff(1,1),ff(2,2),ff(0,1),ff(0,2),ff(1,2));
+ }
+ v = intersection_conserve_mostaniso(v,ff);
+ }
+@@ -1316,6 +1369,77 @@
+ }
+ };
+
++class IntersectAnisoField : public Field
++{
++ std::list<int> idlist;
++ public:
++ IntersectAnisoField()
++ {
++ options["FieldsList"] = new FieldOptionList
++ (idlist, "Field indices", &update_needed);
++ }
++ virtual bool isotropic () const {return false;}
++ std::string getDescription()
++ {
++ return "Take the intersection of 2 anisotropic fields according to Alauzet.";
++ }
++ virtual void operator() (double x, double y, double z, SMetric3 &metr, GEntity *ge=0)
++ {
++ // check if idlist contains 2 elements other error message
++ SMetric3 v;
++ for(std::list<int>::iterator it = idlist.begin(); it != idlist.end(); it++) {
++ Field *f = (GModel::current()->getFields()->get(*it));
++ SMetric3 ff;
++ if(f && *it != id) {
++ if (f->isotropic()){
++ double l = (*f) (x, y, z, ge);
++ ff = SMetric3(1./(l*l));
++ }
++ else{
++ (*f) (x, y, z, ff, ge);
++ }
++ if (it == idlist.begin())
++ v = ff;
++ else
++ v = intersection_alauzet(v,ff);
++ }
++ }
++ metr = v;
++ }
++ double operator() (double x, double y, double z, GEntity *ge=0)
++ {
++ // check if idlist contains 2 elements other error message
++ SMetric3 metr;
++ double v = MAX_LC;
++ for(std::list<int>::iterator it = idlist.begin(); it != idlist.end(); it++) {
++ Field *f = (GModel::current()->getFields()->get(*it));
++ SMetric3 m;
++ if(f && *it != id){
++ if (!f->isotropic()){
++ (*f)(x, y, z, m, ge);
++ }
++ else {
++ double L = (*f)(x, y, z, ge);
++ for (int i = 0; i < 3; i++)
++ m(i,i) = 1. / (L*L);
++ }
++ }
++ if (it == idlist.begin())
++ metr = m;
++ else
++ metr = intersection_alauzet(metr,m);
++ }
++ fullMatrix<double> V(3,3);
++ fullVector<double> S(3);
++ metr.eig(V, S, 1);
++ return sqrt(1./S(2)); //S(2) is largest eigenvalue
++ }
++ const char *getName()
++ {
++ return "IntersectAniso";
++ }
++};
++
+ class MinField : public Field
+ {
+ std::list<int> idlist;
+@@ -1334,7 +1458,18 @@
+ double v = MAX_LC;
+ for(std::list<int>::iterator it = idlist.begin(); it != idlist.end(); it++) {
+ Field *f = (GModel::current()->getFields()->get(*it));
+- if(f && *it != id) v = std::min(v, (*f) (x, y, z, ge));
++ if(f && *it != id) {
++ if (f->isotropic())
++ v = std::min(v, (*f) (x, y, z, ge));
++ else{
++ SMetric3 ff;
++ (*f) (x, y, z, ff, ge);
++ fullMatrix<double> V(3,3);
++ fullVector<double> S(3);
++ ff.eig(V, S, 1);
++ v = std::min(v, sqrt(1./S(2))); //S(2) is largest eigenvalue
++ }
++ }
+ }
+ return v;
+ }
+@@ -1362,7 +1497,18 @@
+ double v = -MAX_LC;
+ for(std::list<int>::iterator it = idlist.begin(); it != idlist.end(); it++) {
+ Field *f = (GModel::current()->getFields()->get(*it));
+- if(f && *it != id) v = std::max(v, (*f) (x, y, z, ge));
++ if(f && *it != id) {
++ if (f->isotropic())
++ v = std::max(v, (*f) (x, y, z, ge));
++ else{
++ SMetric3 ff;
++ (*f) (x, y, z, ff, ge);
++ fullMatrix<double> V(3,3);
++ fullVector<double> S(3);
++ ff.eig(V, S, 1);
++ v = std::max(v, sqrt(1./S(0))); //S(0) is smallest eigenvalue
++ }
++ }
+ }
+ return v;
+ }
+@@ -2011,6 +2157,7 @@
+ #endif
+ map_type_name["Box"] = new FieldFactoryT<BoxField>();
+ map_type_name["Cylinder"] = new FieldFactoryT<CylinderField>();
++ map_type_name["Sphere"] = new FieldFactoryT<SphereField>();
+ map_type_name["Frustum"] = new FieldFactoryT<FrustumField>();
+ map_type_name["LonLat"] = new FieldFactoryT<LonLatField>();
+ #if defined(HAVE_POST)
+@@ -2020,6 +2167,7 @@
+ map_type_name["Restrict"] = new FieldFactoryT<RestrictField>();
+ map_type_name["Min"] = new FieldFactoryT<MinField>();
+ map_type_name["MinAniso"] = new FieldFactoryT<MinAnisoField>();
++ map_type_name["IntersectAniso"] = new FieldFactoryT<IntersectAnisoField>();
+ map_type_name["Max"] = new FieldFactoryT<MaxField>();
+ map_type_name["UTM"] = new FieldFactoryT<UTMField>();
+ map_type_name["Laplacian"] = new FieldFactoryT<LaplacianField>();
+Index: gmsh-2.5.1~beta2~svn11871~dfsg/Geo/STensor3.h
+===================================================================
+--- gmsh-2.5.1~beta2~svn11871~dfsg.orig/Geo/STensor3.h (révision 11871)
++++ gmsh-2.5.1~beta2~svn11871~dfsg/Geo/STensor3.h (copie de travail)
+@@ -171,6 +171,8 @@
+ // compute the largest inscribed ellipsoid...
+ SMetric3 intersection (const SMetric3 &m1,
+ const SMetric3 &m2);
++SMetric3 intersection_alauzet (const SMetric3 &m1,
++ const SMetric3 &m2);
+ SMetric3 interpolation (const SMetric3 &m1,
+ const SMetric3 &m2,
+ const double t);
+Index: gmsh-2.5.1~beta2~svn11871~dfsg/Geo/STensor3.cpp
+===================================================================
+--- gmsh-2.5.1~beta2~svn11871~dfsg.orig/Geo/STensor3.cpp (révision 11871)
++++ gmsh-2.5.1~beta2~svn11871~dfsg/Geo/STensor3.cpp (copie de travail)
+@@ -38,6 +38,27 @@
+ return iv;
+ }
+
++SMetric3 intersection_alauzet (const SMetric3 &m1, const SMetric3 &m2)
++{
++ SMetric3 im1 = m1.invert();
++ fullMatrix<double> V(3,3);
++ fullVector<double> S(3);
++ im1 *= m2;
++ im1.eig(V,S,true);
++ SVector3 v0(V(0,0),V(1,0),V(2,0));
++ SVector3 v1(V(0,1),V(1,1),V(2,1));
++ SVector3 v2(V(0,2),V(1,2),V(2,2));
++ // is this required??
++ v0.normalize();
++ v1.normalize();
++ v2.normalize();
++ double l0 = std::max(dot(v0,m1,v0),dot(v0,m2,v0));
++ double l1 = std::max(dot(v1,m1,v1),dot(v1,m2,v1));
++ double l2 = std::max(dot(v2,m1,v2),dot(v2,m2,v2));
++ SMetric3 iv(l0,l1,l2,v0,v1,v2);
++ return iv;
++}
++
+ // preserve orientation of m1 !!!
+ SMetric3 intersection_conserveM1 (const SMetric3 &m1, const SMetric3 &m2)
+ {
Added: packages/gmsh-tetgen/trunk/debian/patches/add-missing-headers.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/gmsh-tetgen/trunk/debian/patches/add-missing-headers.patch?rev=44743&op=file
==============================================================================
--- packages/gmsh-tetgen/trunk/debian/patches/add-missing-headers.patch (added)
+++ packages/gmsh-tetgen/trunk/debian/patches/add-missing-headers.patch Fri Apr 27 07:09:04 2012
@@ -1,0 +1,34 @@
+Index: gmsh-2.5.1~beta2~svn11641~dfsg-1/CMakeLists.txt
+===================================================================
+--- gmsh-2.5.1~beta2~svn11641~dfsg-1.orig/CMakeLists.txt 2012-03-15 10:49:38.000000000 +0100
++++ gmsh-2.5.1~beta2~svn11641~dfsg-1/CMakeLists.txt 2012-03-15 13:20:31.000000000 +0100
+@@ -80,6 +80,7 @@
+ ${CMAKE_CURRENT_BINARY_DIR}/Common/GmshVersion.h
+ Common/Gmsh.h Common/Context.h Common/GmshDefines.h Common/GmshMessage.h
+ Common/VertexArray.h Common/Octree.h Common/OctreeInternals.h
++ Common/OS.h Common/Options.h Common/OpenFile.h Common/StringUtils.h
+ Numeric/Numeric.h Numeric/GaussIntegration.h Numeric/polynomialBasis.h
+ Numeric/JacobianBasis.h Numeric/fullMatrix.h
+ Numeric/simpleFunction.h Numeric/cartesian.h
+@@ -95,16 +96,21 @@
+ Geo/SVector3.h Geo/STensor3.h Geo/SBoundingBox3d.h Geo/Pair.h Geo/Range.h
+ Geo/SOrientedBoundingBox.h Geo/CellComplex.h Geo/ChainComplex.h Geo/Cell.h
+ Geo/Homology.h Geo/Chain.h Geo/partitionEdge.h Geo/CGNSOptions.h Geo/gmshLevelset.h
++ Geo/Chain.h
+ Mesh/meshGEdge.h Mesh/meshGFace.h Mesh/meshGFaceOptimize.h Mesh/meshPartition.h
+ Mesh/meshGFaceDelaunayInsertion.h Mesh/simple3D.h Mesh/meshPartitionOptions.h
+ Mesh/Voronoi3D.h Mesh/Levy3D.h Mesh/periodical.h
++ Mesh/Field.h
+ Numeric/mathEvaluator.h
+ Solver/dofManager.h Solver/femTerm.h Solver/laplaceTerm.h Solver/elasticityTerm.h
+ Solver/crossConfTerm.h Solver/orthogonalTerm.h
+ Solver/linearSystem.h Solver/linearSystemGMM.h Solver/linearSystemCSR.h
+ Solver/linearSystemFull.h Solver/elasticitySolver.h Solver/sparsityPattern.h
++ Solver/functionSpace.h Solver/STensor43.h Solver/STensor33.h
+ Post/PView.h Post/PViewData.h Plugin/PluginManager.h Post/OctreePost.h
++ Post/ColorTable.h Post/PViewOptions.h Post/PViewData.h
+ Graphics/drawContext.h
++ Graphics/Camera.h Graphics/Trackball.h
+ contrib/kbipack/gmp_normal_form.h contrib/kbipack/gmp_matrix.h
+ contrib/kbipack/gmp_blas.h contrib/kbipack/mpz.h
+ contrib/DiscreteIntegration/Integration3D.h
Added: packages/gmsh-tetgen/trunk/debian/patches/api_demos.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/gmsh-tetgen/trunk/debian/patches/api_demos.patch?rev=44743&op=file
==============================================================================
--- packages/gmsh-tetgen/trunk/debian/patches/api_demos.patch (added)
+++ packages/gmsh-tetgen/trunk/debian/patches/api_demos.patch Fri Apr 27 07:09:04 2012
@@ -1,0 +1,845 @@
+Desctiption: fix compilation of api_demos
+Author: Christophe Trophime <christophe.trophime at lncmi.cnrs.fr>
+Reviewed-by: Anton Gladky <gladky.anton at gmail.com>
+Last-Update: 2012-03-11
+
+--- a/utils/api_demos/CMakeLists.txt
++++ b/utils/api_demos/CMakeLists.txt
+@@ -9,45 +9,691 @@
+ set(CMAKE_BUILD_TYPE RelWithDebInfo CACHE STRING "Choose build type")
+ endif(DEFINED CMAKE_BUILD_TYPE)
+
+-project(api_demos CXX)
++project(api_demos CXX C)
+
+-add_subdirectory(../.. "${CMAKE_CURRENT_BINARY_DIR}/gmsh")
+-
+-include_directories(../../Common ../../Numeric ../../Geo ../../Mesh
+- ../../Solver ../../Post ../../Plugin ../../Graphics ../../contrib/ANN/include
+- ../../contrib/DiscreteIntegration ${GMSH_EXTERNAL_INCLUDE_DIRS}
+- ${CMAKE_CURRENT_BINARY_DIR}/gmsh/Common)
++# this variable controls the default value of the "ENABLE_XXX" options which are
++# normally set to ON (useful if you want to configure a minimal version of Gmsh:
++# e.g. "cmake -DDEFAULT=0 -DENABLE_POST=1 -DENABLE_PARSER=1")
++set(DEFAULT ON CACHE INTERNAL "Default value for options")
++
++option(ENABLE_GMSH "Enable Gmsh" ${DEFAULT})
++option(ENABLE_ANN "Enable ANN to compute Approximate Nearest Neighbors" ${DEFAULT})
++option(ENABLE_KBIPACK "Enable Kbipack for homology solver" ${DEFAULT})
++option(ENABLE_MATHEX "Enable MathEx expression parser" ${DEFAULT})
++option(ENABLE_OCC "Enable Open CASCADE geometrical models" ${DEFAULT})
++option(ENABLE_PETSC "Enable PETSc linear algebra solvers" ${DEFAULT})
++option(ENABLE_SLEPC "Enable SLEPc eigensolvers" ${DEFAULT})
++option(ENABLE_FLTK "Build FLTK GUI" ${DEFAULT})
++option(ENABLE_FL_TREE "Enable FLTK tree browser widget" ${DEFAULT})
++option(ENABLE_MED "Enable MED mesh and post-processing file formats" ${DEFAULT})
++option(ENABLE_MMG3D "Enable 3D Mobile Mesh Generation" ${DEFAULT})
++option(ENABLE_TETGEN "Enable Tetgen mesh generator" ${DEFAULT})
++option(ENABLE_TETGEN_NEW "Enable experimental version of Tetgen" OFF)
++option(ENABLE_GRAPHICS "Compile-in OpenGL graphics even if there is no GUI" OFF)
++option(ENABLE_MESH "Build the mesh module" ${DEFAULT})
++option(ENABLE_POST "Build the post-processing module" ${DEFAULT})
++option(ENABLE_PLUGINS "Build the post-processing plugins" ${DEFAULT})
++option(ENABLE_DINTEGRATION "Enable discrete integration and levelsets" ${DEFAULT})
++option(ENABLE_BLAS_LAPACK "Use BLAS and Lapack for linear algebra" ON)
++
++include(CheckTypeSize)
++include(CheckFunctionExists)
++include(CheckIncludeFile)
++
++macro(find_all_libraries VARNAME LISTNAME PATH SUFFIX)
++ set(${VARNAME})
++ list(LENGTH ${LISTNAME} NUM_LIST)
++ foreach(LIB ${${LISTNAME}})
++ find_library(FOUND_LIB ${LIB} PATHS ${PATH} PATH_SUFFIXES ${SUFFIX})
++ if(FOUND_LIB)
++ list(APPEND ${VARNAME} ${FOUND_LIB})
++ endif(FOUND_LIB)
++ set(FOUND_LIB FOUND_LIB-NOTFOUND CACHE INTERNAL "")
++ # unset(FOUND_LIB CACHE) # cleaner, but only available in cmake >= 2.6.4
++ endforeach(LIB)
++ list(LENGTH ${VARNAME} NUM_FOUND_LIBRARIES)
++ if(NUM_FOUND_LIBRARIES LESS NUM_LIST)
++ set(${VARNAME})
++ endif(NUM_FOUND_LIBRARIES LESS NUM_LIST)
++endmacro(find_all_libraries)
++
++macro(set_config_option VARNAME STRING)
++ set(${VARNAME} TRUE)
++ list(APPEND CONFIG_OPTIONS ${STRING})
++ message(STATUS "Found " ${STRING})
++endmacro(set_config_option)
++
++# check if the machine is 64 bits (this is more reliable than using
++# CMAKE_SIZEOF_VOID_P, which does not seem to work e.g. on some Suse
++# machines)
++check_type_size("void*" SIZEOF_VOID_P)
++if(SIZEOF_VOID_P EQUAL 8)
++ set_config_option(HAVE_64BIT_SIZE_T "Have64BitSizeT")
++endif(SIZEOF_VOID_P EQUAL 8)
++
++if(ENABLE_BLAS_LAPACK)
++ if(MSVC)
++ # on Windows with Visual C++ try really hard to find blas/lapack
++ # *without* requiring a Fortran compiler: 1) try to find the Intel
++ # MKL libs using the standard search path; if not found 2) try to
++ # get the reference blas/lapack libs (useful for users with no
++ # Fortran compiler and no MKL license, who can just download our
++ # precompiled "gmsh-dep" package)
++ if(HAVE_64BIT_SIZE_T)
++ set(MKL_PATH em64t/lib)
++ else(HAVE_64BIT_SIZE_T)
++ set(MKL_PATH ia32/lib)
++ endif(HAVE_64BIT_SIZE_T)
++ set(MKL_LIBS_REQUIRED libguide40 mkl_intel_c mkl_intel_thread mkl_core)
++ find_all_libraries(LAPACK_LIBRARIES MKL_LIBS_REQUIRED "" ${MKL_PATH})
++ if(LAPACK_LIBRARIES)
++ set_config_option(HAVE_BLAS "Blas(IntelMKL)")
++ set_config_option(HAVE_LAPACK "Lapack(IntelMKL)")
++ else(LAPACK_LIBRARIES)
++ set(REFLAPACK_LIBS_REQUIRED lapack blas g2c gcc)
++ find_all_libraries(LAPACK_LIBRARIES REFLAPACK_LIBS_REQUIRED "" "")
++ if(LAPACK_LIBRARIES)
++ set_config_option(HAVE_BLAS "Blas(Ref)")
++ set_config_option(HAVE_LAPACK "Lapack(Ref)")
++ endif(LAPACK_LIBRARIES)
++ endif(LAPACK_LIBRARIES)
++ elseif(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
++ # on Linux try to find the Intel MKL without a Fortran compiler
++ if(HAVE_64BIT_SIZE_T)
++ set(MKL_PATH lib/em64t)
++ else(HAVE_64BIT_SIZE_T)
++ set(MKL_PATH lib/32)
++ endif(HAVE_64BIT_SIZE_T)
++ set(MKL_LIBS_REQUIRED mkl_gf_lp64 iomp5 mkl_gnu_thread mkl_core guide pthread)
++ find_all_libraries(LAPACK_LIBRARIES MKL_LIBS_REQUIRED "" ${MKL_PATH})
++ if(NOT LAPACK_LIBRARIES)
++ #match lapack 9.0 on 64bit
++ set(MKL_LIBS_REQUIRED mkl_lapack mkl_em64t guide)
++ find_all_libraries(LAPACK_LIBRARIES MKL_LIBS_REQUIRED "" ${MKL_PATH})
++ endif(NOT LAPACK_LIBRARIES)
++ if(LAPACK_LIBRARIES)
++ set_config_option(HAVE_BLAS "Blas(IntelMKL)")
++ set_config_option(HAVE_LAPACK "Lapack(IntelMKL)")
++ else(LAPACK_LIBRARIES)
++ # on Linux also try to find ATLAS without a Fortran compiler,
++ # because cmake ships with a buggy FindBLAS e.g. on Ubuntu Lucid
++ # Lynx
++ set(ATLAS_LIBS_REQUIRED lapack f77blas cblas atlas)
++ find_all_libraries(LAPACK_LIBRARIES ATLAS_LIBS_REQUIRED "" "")
++ if(LAPACK_LIBRARIES)
++ set_config_option(HAVE_BLAS "Blas(ATLAS)")
++ set_config_option(HAVE_LAPACK "Lapack(ATLAS)")
++ endif(LAPACK_LIBRARIES)
++ endif(LAPACK_LIBRARIES)
++ elseif(${CMAKE_SYSTEM_NAME} MATCHES "SunOS")
++ # on SunOS we know blas and lapack are available in sunperf
++ set(LAPACK_FLAGS -library=sunperf)
++ set_config_option(HAVE_BLAS "Blas(SubPerf)")
++ set_config_option(HAVE_LAPACK "Lapack(SunPerf)")
++ elseif(APPLE)
++ # on Mac we also know that blas and lapack are available
++ set(LAPACK_LIBRARIES "-framework vecLib")
++ set_config_option(HAVE_BLAS "Blas(VecLib)")
++ set_config_option(HAVE_LAPACK "Lapack(VecLib)")
++ endif(MSVC)
++ if(NOT HAVE_BLAS OR NOT HAVE_LAPACK)
++ # if we haven't found blas and lapack without using the standard
++ # cmake tests, do it (this requires a working Fortran compiler)
++ enable_language(Fortran)
++ find_package(BLAS)
++ if(BLAS_FOUND)
++ set_config_option(HAVE_BLAS "Blas")
++ find_package(LAPACK)
++ if(LAPACK_FOUND)
++ set_config_option(HAVE_LAPACK "Lapack")
++ else(LAPACK_FOUND)
++ set(LAPACK_LIBRARIES ${BLAS_LIBRARIES})
++ endif(LAPACK_FOUND)
++ if(CMAKE_Fortran_COMPILER_ID MATCHES "GNU")
++ if(CMAKE_Fortran_COMPILER MATCHES "gfortran")
++ list(APPEND LAPACK_LIBRARIES gfortran)
++ elseif(CMAKE_Fortran_COMPILER MATCHES "f95")
++ list(APPEND LAPACK_LIBRARIES gfortran)
++ elseif(CMAKE_Fortran_COMPILER MATCHES "g77")
++ list(APPEND LAPACK_LIBRARIES g2c)
++ endif(CMAKE_Fortran_COMPILER MATCHES "gfortran")
++ endif(CMAKE_Fortran_COMPILER_ID MATCHES "GNU")
++ endif(BLAS_FOUND)
++ endif(NOT HAVE_BLAS OR NOT HAVE_LAPACK)
++ if(NOT HAVE_BLAS OR NOT HAVE_LAPACK)
++ message("WARNING: Could not find Blas or Lapack: most meshing algorithms "
++ "will not be functional")
++ endif(NOT HAVE_BLAS OR NOT HAVE_LAPACK)
++endif(ENABLE_BLAS_LAPACK)
++
++if(ENABLE_KBIPACK)
++ find_library(GMP_LIB gmp)
++ if(GMP_LIB)
++ find_path(GMP_INC "gmp.h" PATH_SUFFIXES src include)
++ if(GMP_INC)
++ set_config_option(HAVE_GMP "GMP")
++ list(APPEND EXTERNAL_LIBRARIES ${GMP_LIB})
++ list(APPEND EXTERNAL_INCLUDES ${GMP_INC})
++ include_directories(../../contrib/kbipack)
++ set_config_option(HAVE_KBIPACK "Kbipack")
++ endif(GMP_INC)
++ endif(GMP_LIB)
++endif(ENABLE_KBIPACK)
++
++if(ENABLE_MATHEX)
++ include_directories(../../contrib/MathEx)
++ set_config_option(HAVE_MATHEX "MathEx")
++endif(ENABLE_MATHEX)
++
++if(ENABLE_PETSC)
++ set(ENV_PETSC_DIR $ENV{PETSC_DIR})
++ set(ENV_PETSC_ARCH $ENV{PETSC_ARCH})
++ if(EXISTS ${ENV_PETSC_DIR}/${ENV_PETSC_ARCH}/conf/petscvariables)
++ # old-style PETSc installations (using PETSC_DIR and PETSC_ARCH)
++ set_config_option(HAVE_PETSC "PETSc")
++ file(STRINGS ${ENV_PETSC_DIR}/${ENV_PETSC_ARCH}/conf/petscvariables
++ PETSC_VARIABLES NEWLINE_CONSUME)
++ # find include directories
++ list(APPEND EXTERNAL_INCLUDES ${ENV_PETSC_DIR}/include)
++ list(APPEND EXTERNAL_INCLUDES ${ENV_PETSC_DIR}/${ENV_PETSC_ARCH}/include)
++ string(REGEX MATCH "PACKAGES_INCLUDES = [^\n\r]*" PETSC_PACKAGES_INCLUDES
++ ${PETSC_VARIABLES})
++ if(PETSC_PACKAGES_INCLUDES)
++ string(REPLACE "PACKAGES_INCLUDES = " "" PETSC_PACKAGES_INCLUDES
++ ${PETSC_PACKAGES_INCLUDES})
++ if(PETSC_PACKAGES_INCLUDES)
++ string(REPLACE "-I" "" PETSC_PACKAGES_INCLUDES ${PETSC_PACKAGES_INCLUDES})
++ string(REPLACE " " ";" PETSC_PACKAGES_INCLUDES ${PETSC_PACKAGES_INCLUDES})
++ foreach(VAR ${PETSC_PACKAGES_INCLUDES})
++ list(APPEND EXTERNAL_INCLUDES ${VAR})
++ endforeach(VAR)
++ endif(PETSC_PACKAGES_INCLUDES)
++ endif(PETSC_PACKAGES_INCLUDES)
++ # find libraries (<= 3.0)
++ set(PETSC_LIBS_REQUIRED petscksp petscdm petscmat petscvec petsc)
++ find_all_libraries(PETSC_LIBS PETSC_LIBS_REQUIRED
++ ${ENV_PETSC_DIR}/${ENV_PETSC_ARCH}/lib "")
++ # petsc 3.1 creates only one library (libpetsc)
++ if(NOT PETSC_LIBS)
++ find_library(PETSC_LIBS petsc PATHS ${ENV_PETSC_DIR}/${ENV_PETSC_ARCH}/lib)
++ endif(NOT PETSC_LIBS)
++ # find slepc (needs to be linked in before petsc)
++ if(ENABLE_SLEPC)
++ set(ENV_SLEPC_DIR $ENV{SLEPC_DIR})
++ find_library(SLEPC_LIB slepc PATHS ${ENV_SLEPC_DIR}/${ENV_PETSC_ARCH}/lib)
++ if(SLEPC_LIB)
++ find_path(SLEPC_INC "slepc.h" PATHS ${ENV_SLEPC_DIR} PATH_SUFFIXES include
++ ${ENV_PETSC_ARCH}/include include/slepc)
++ if(SLEPC_INC)
++ set_config_option(HAVE_SLEPC "SLEPc")
++ list(APPEND EXTERNAL_LIBRARIES ${SLEPC_LIB})
++ list(APPEND EXTERNAL_INCLUDES ${SLEPC_INC})
++ find_path(SLEPC_INC2 "slepcconf.h" PATHS ${ENV_SLEPC_DIR}
++ PATH_SUFFIXES ${ENV_PETSC_ARCH}/include)
++ if(SLEPC_INC2)
++ list(APPEND EXTERNAL_INCLUDES ${SLEPC_INC2})
++ endif(SLEPC_INC2)
++ endif(SLEPC_INC)
++ endif(SLEPC_LIB)
++ if(NOT HAVE_SLEPC AND NOT ENV_SLEPC_DIR)
++ message("WARNING: Export SLEPC_DIR before calling cmake")
++ endif(NOT HAVE_SLEPC AND NOT ENV_SLEPC_DIR)
++ endif(ENABLE_SLEPC)
++ list(APPEND EXTERNAL_LIBRARIES ${PETSC_LIBS})
++ # find additional libraries to link with
++ string(REGEX MATCH "PACKAGES_LIBS = [^\n\r]*" PLIBS ${PETSC_VARIABLES})
++ if(PLIBS)
++ string(REPLACE "PACKAGES_LIBS = " "" PLIBS ${PLIBS})
++ string(STRIP ${PLIBS} PLIBS)
++ list(APPEND EXTERNAL_LIBRARIES "${PLIBS}")
++ endif(PLIBS)
++ string(REGEX MATCH "PETSC_EXTERNAL_LIB_BASIC = [^\n\r]*" PLIBS_BASIC ${PETSC_VARIABLES})
++ if(PLIBS_BASIC)
++ string(REPLACE "PETSC_EXTERNAL_LIB_BASIC = " "" PLIBS_BASIC ${PLIBS_BASIC})
++ string(STRIP ${PLIBS_BASIC} PLIBS_BASIC)
++ list(APPEND EXTERNAL_LIBRARIES "${PLIBS_BASIC}")
++ endif(PLIBS_BASIC)
++ string(REGEX MATCH "PCC_LINKER_LIBS = [^\n\r]*" LLIBS ${PETSC_VARIABLES})
++ if(LLIBS)
++ string(REPLACE "PCC_LINKER_LIBS = " "" LLIBS ${LLIBS})
++ string(STRIP ${LLIBS} LLIBS)
++ list(APPEND EXTERNAL_LIBRARIES "${LLIBS}")
++ endif(LLIBS)
++ else(EXISTS ${ENV_PETSC_DIR}/${ENV_PETSC_ARCH}/conf/petscvariables)
++ # new-style PETSc installations (in standard system directories)
++ find_library(PETSC_LIBS petsc)
++ find_path(PETSC_INC "petsc.h" PATH_SUFFIXES include/petsc)
++ if(PETSC_LIBS AND PETSC_INC)
++ set_config_option(HAVE_PETSC "PETSc")
++ if(ENABLE_SLEPC)
++ find_library(SLEPC_LIB slepc)
++ find_path(SLEPC_INC "slepc.h" PATH_SUFFIXES include/slepc)
++ if(SLEPC_LIB AND SLEPC_INC)
++ set_config_option(HAVE_SLEPC "SLEPc")
++ list(APPEND EXTERNAL_LIBRARIES ${SLEPC_LIB})
++ list(APPEND EXTERNAL_INCLUDES ${SLEPC_INC})
++ endif(SLEPC_LIB AND SLEPC_INC)
++ endif(ENABLE_SLEPC)
++ list(APPEND EXTERNAL_LIBRARIES ${PETSC_LIBS})
++ list(APPEND EXTERNAL_INCLUDES ${PETSC_INC})
++ endif(PETSC_LIBS AND PETSC_INC)
++ endif(EXISTS ${ENV_PETSC_DIR}/${ENV_PETSC_ARCH}/conf/petscvariables)
++ if(NOT HAVE_PETSC AND NOT ENV_PETSC_DIR)
++ message("WARNING: Export PETSC_DIR before calling cmake")
++ endif(NOT HAVE_PETSC AND NOT ENV_PETSC_DIR)
++ if(NOT HAVE_PETSC AND NOT ENV_PETSC_ARCH)
++ message("WARNING: Export PETSC_ARCH before calling cmake")
++ endif(NOT HAVE_PETSC AND NOT ENV_PETSC_ARCH)
++ endif(ENABLE_PETSC)
++
++if(ENABLE_OCC)
++ if(WIN32 OR CYGWIN)
++ if(HAVE_64BIT_SIZE_T)
++ set(OCC_SYS_NAME win64)
++ else(HAVE_64BIT_SIZE_T)
++ set(OCC_SYS_NAME win32)
++ endif(HAVE_64BIT_SIZE_T)
++ else(WIN32 OR CYGWIN)
++ set(OCC_SYS_NAME ${CMAKE_SYSTEM_NAME})
++ endif(WIN32 OR CYGWIN)
++ set(OCC_LIBS_REQUIRED
++ # subset of DataExchange
++ TKSTEP TKSTEP209 TKSTEPAttr TKSTEPBase TKIGES TKXSBase
++ # ModelingAlgorithms
++ TKOffset TKFeat TKFillet TKBool TKShHealing TKMesh TKHLR TKBO TKPrim
++ TKTopAlgo TKGeomAlgo
++ # ModelingData
++ TKBRep TKGeomBase TKG3d TKG2d
++ # FoundationClasses
++ TKAdvTools TKMath TKernel)
++ list(LENGTH OCC_LIBS_REQUIRED NUM_OCC_LIBS_REQUIRED)
++ set(OCC_LIBS)
++ foreach(OCC ${OCC_LIBS_REQUIRED})
++ find_library(OCC_LIB ${OCC} HINTS ENV CASROOT PATH_SUFFIXES lib
++ ${OCC_SYS_NAME}/lib ${OCC_SYS_NAME}/vc8/lib)
++ if(OCC_LIB)
++ list(APPEND OCC_LIBS ${OCC_LIB})
++ else(OCC_LIB)
++ message(STATUS "OCC lib " ${OCC} " not Found")
++ endif(OCC_LIB)
++ set(OCC_LIB OCC_LIB-NOTFOUND CACHE INTERNAL "")
++ # unset(OCC_LIB CACHE) # cleaner, but only available in cmake >= 2.6.4
++ endforeach(OCC)
++ list(LENGTH OCC_LIBS NUM_OCC_LIBS)
++ if(NUM_OCC_LIBS EQUAL NUM_OCC_LIBS_REQUIRED)
++ find_path(OCC_INC "BRep_Tool.hxx" PATHS ENV CASROOT PATH_SUFFIXES inc
++ include include/oce opencascade)
++ if(OCC_INC)
++ set_config_option(HAVE_OCC "OpenCascade")
++ list(APPEND EXTERNAL_LIBRARIES ${OCC_LIBS})
++ list(APPEND EXTERNAL_INCLUDES ${OCC_INC})
++ if(HAVE_64BIT_SIZE_T)
++ add_definitions(-D_OCC64)
++ endif(HAVE_64BIT_SIZE_T)
++ if(CYGWIN)
++ list(APPEND EXTERNAL_LIBRARIES "winspool")
++ elseif(MSVC)
++ add_definitions(-DWNT)
++ endif(CYGWIN)
++ find_path(OCC_CONFIG_H "config.h" PATHS ${OCC_INC} ${OCC_CONFIG_H_PATH}
++ NO_DEFAULT_PATH)
++ if(NOT OCC_CONFIG_H)
++ add_definitions(-DHAVE_NO_OCC_CONFIG_H)
++ endif(NOT OCC_CONFIG_H)
++ endif(OCC_INC)
++ endif(NUM_OCC_LIBS EQUAL NUM_OCC_LIBS_REQUIRED)
++endif(ENABLE_OCC)
++
++if(ENABLE_ANN)
++ find_library(ANN_LIB ann PATH_SUFFIXES lib)
++ find_path(ANN_INC "ANN.h" PATH_SUFFIXES src include ANN)
++ if(ANN_LIB AND ANN_INC)
++ list(APPEND EXTERNAL_LIBRARIES ${ANN_LIB})
++ list(APPEND EXTERNAL_INCLUDES ${ANN_INC})
++ set_config_option(HAVE_ANN "Ann")
++ else(ANN_LIB AND ANN_INC)
++ message(STATUS "System ANN not found - using contrib/ANN instead")
++ add_subdirectory(../contrib/ANN)
++ include_directories(../contrib/ANN/include)
++ endif(ANN_LIB AND ANN_INC)
++endif(ENABLE_ANN)
++
++find_library(GMSH_LIB gmsh PATH_SUFFIXES lib)
++find_path(GMSH_INC "Gmsh.h" PATH_SUFFIXES src include gmsh)
++if(GMSH_LIB AND GMSH_INC)
++ list(APPEND EXTERNAL_LIBRARIES ${GMSH_LIB})
++ list(APPEND EXTERNAL_INCLUDES ${GMSH_INC})
++ set_config_option(HAVE_GMSH "Gmsh")
++else(GMSH_LIB AND GMSH_INC)
++ message(STATUS "Gmsh.h not found")
++endif(GMSH_LIB AND GMSH_INC)
++
++find_library(ANTTWEAKBAR_LIB AntTweakBar PATH_SUFFIXES lib)
++find_path(ANTTWEAKBAR_INC "AntTweakBar.h" PATH_SUFFIXES src include AntTweakBar)
++if(ANTTWEAKBAR_LIB AND ANTTWEAKBAR_INC)
++ list(APPEND EXTERNAL_LIBRARIES ${ANTTWEAKBAR_LIB})
++ list(APPEND EXTERNAL_INCLUDES ${ANTTWEAKBAR_INC})
++ set_config_option(HAVE_ANTTWEAKBAR "AntTweakBar")
++else(ANTTWEAKBAR_LIB AND ANTTWEAKBAR_INC)
++ message(STATUS "ANTTWEAKBAR not found")
++endif(ANTTWEAKBAR_LIB AND ANTTWEAKBAR_INC)
++
++if(ENABLE_FLTK)
++ # first, try to use fltk-config for fltk >= 1.3 (FindFLTK is buggy
++ # on Unix, where e.g. xft and xinerama options are not dealt with)
++ find_program(FLTK_CONFIG_SCRIPT fltk-config)
++ if(FLTK_CONFIG_SCRIPT)
++ execute_process(COMMAND ${FLTK_CONFIG_SCRIPT} --api-version
++ OUTPUT_VARIABLE FLTK_VERSION)
++ string(STRIP ${FLTK_VERSION} FLTK_VERSION)
++ if(FLTK_VERSION GREATER 1.1)
++ set_config_option(HAVE_FLTK "Fltk")
++ message(STATUS "Using fltk-config script for Fltk " ${FLTK_VERSION})
++ execute_process(COMMAND ${FLTK_CONFIG_SCRIPT} --use-gl --use-images --includedir
++ OUTPUT_VARIABLE FLTK_INCLUDE_DIR)
++ string(STRIP ${FLTK_INCLUDE_DIR} FLTK_INCLUDE_DIR)
++ list(APPEND EXTERNAL_INCLUDES ${FLTK_INCLUDE_DIR} ${FLTK_INCLUDE_DIR}/FL/images
++ ${FLTK_INCLUDE_DIR}/jpeg ${FLTK_INCLUDE_DIR}/zlib ${FLTK_INCLUDE_DIR}/png)
++ execute_process(COMMAND ${FLTK_CONFIG_SCRIPT} --use-gl --use-images --ldflags
++ OUTPUT_VARIABLE FLTK_LIBRARIES)
++ string(STRIP ${FLTK_LIBRARIES} FLTK_LIBRARIES)
++ string(REGEX MATCH "fltk[_ ]jpeg" FLTK_JPEG ${FLTK_LIBRARIES})
++ string(REGEX MATCH "fltk[_ ]z" FLTK_Z ${FLTK_LIBRARIES})
++ string(REGEX MATCH "fltk[_ ]png" FLTK_PNG ${FLTK_LIBRARIES})
++ endif(FLTK_VERSION GREATER 1.1)
++ endif(FLTK_CONFIG_SCRIPT)
++ # then try the built-in FindFLTK module
++ if(NOT HAVE_FLTK)
++ set(FLTK_SKIP_FORMS TRUE)
++ set(FLTK_SKIP_FLUID TRUE)
++ find_package(FLTK)
++ if(FLTK_FOUND)
++ add_subdirectory(Fltk)
++ set_config_option(HAVE_FLTK "Fltk")
++ list(APPEND EXTERNAL_INCLUDES ${FLTK_INCLUDE_DIR})
++ # find fltk jpeg
++ find_library(FLTK_JPEG NAMES fltk_jpeg fltkjpeg)
++ if(FLTK_JPEG)
++ list(APPEND EXTERNAL_LIBRARIES ${FLTK_JPEG})
++ foreach(DIR ${FLTK_INCLUDE_DIR})
++ list(APPEND EXTERNAL_INCLUDES ${DIR}/FL/images ${DIR}/jpeg)
++ endforeach(DIR)
++ endif(FLTK_JPEG)
++ # find fltk zlib
++ find_library(FLTK_Z NAMES fltk_z fltkz)
++ if(FLTK_Z)
++ list(APPEND EXTERNAL_LIBRARIES ${FLTK_Z})
++ foreach(DIR ${FLTK_INCLUDE_DIR})
++ list(APPEND EXTERNAL_INCLUDES ${DIR}/FL/images ${DIR}/zlib)
++ endforeach(DIR)
++ endif(FLTK_Z)
++ # find fltk png
++ find_library(FLTK_PNG NAMES fltk_png fltkpng)
++ if(FLTK_PNG)
++ list(APPEND EXTERNAL_LIBRARIES ${FLTK_PNG})
++ foreach(DIR ${FLTK_INCLUDE_DIR})
++ list(APPEND EXTERNAL_INCLUDES ${DIR}/FL/images ${DIR}/png)
++ endforeach(DIR)
++ endif(FLTK_PNG)
++ endif(FLTK_FOUND)
++ endif(NOT HAVE_FLTK)
++ if(HAVE_FLTK)
++ if(ENABLE_NATIVE_FILE_CHOOSER)
++ if(NOT FLTK_VERSION OR FLTK_VERSION EQUAL 1.1)
++ add_subdirectory(contrib/NativeFileChooser)
++ include_directories(contrib/NativeFileChooser)
++ add_definitions(-DFLTK1)
++ endif(NOT FLTK_VERSION OR FLTK_VERSION EQUAL 1.1)
++ set_config_option(HAVE_NATIVE_FILE_CHOOSER "NativeFileChooser")
++ endif(ENABLE_NATIVE_FILE_CHOOSER)
++ if(ENABLE_FL_TREE)
++ if(NOT FLTK_VERSION OR FLTK_VERSION EQUAL 1.1)
++ add_subdirectory(contrib/Fl_Tree)
++ include_directories(contrib/Fl_Tree)
++ endif(NOT FLTK_VERSION OR FLTK_VERSION EQUAL 1.1)
++ set_config_option(HAVE_FL_TREE "FlTree")
++ endif(ENABLE_FL_TREE)
++ endif(HAVE_FLTK)
++elseif(ENABLE_QT)
++ find_package(Qt4)
++ set(QT_USE_QTOPENGL TRUE)
++ include(${QT_USE_FILE})
++ if(QT_FOUND)
++ add_subdirectory(Qt)
++ set_config_option(HAVE_QT "Qt")
++ list(APPEND EXTERNAL_INCLUDES ${QT_INCLUDE_DIR})
++ endif(QT_FOUND)
++endif(ENABLE_FLTK)
+
+ if(APPLE)
+ set(glut "-framework GLUT")
+ else(APPLE)
+- set(glut "glut")
++ list(APPEND EXTERNAL_LIBRARIES "glut")
+ endif(APPLE)
+
++ if(ENABLE_MMG3D)
++ find_library(MMG3D_LIB mmg3dlib4.0 PATH_SUFFIXES lib)
++ find_path(MMG3D_INC "libmmg3d.h" PATH_SUFFIXES src include)
++ if(MMG3D_LIB AND MMG3D_INC)
++ list(APPEND EXTERNAL_LIBRARIES ${MMG3D_LIB})
++ list(APPEND EXTERNAL_INCLUDES ${MMG3D_INC})
++ else(MMG3D_LIB AND MMG3D_INC)
++ message(STATUS "System MMG3D not found - using contrib/mmg3d instead")
++ add_subdirectory(contrib/mmg3d)
++ include_directories(contrib/mmg3d/build/sources)
++ endif(MMG3D_LIB AND MMG3D_INC)
++ set_config_option(HAVE_MMG3D "Mmg3d")
++ endif(ENABLE_MMG3D)
++
++ if(ENABLE_TETGEN_NEW AND EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/contrib/TetgenNew/tetgen.h)
++ add_subdirectory(contrib/TetgenNew)
++ include_directories(contrib/TetgenNew)
++ set_config_option(HAVE_TETGEN "Tetgen(New)")
++ add_definitions(-DTETLIBRARY)
++ message("WARNING: You are including an experimental version of Tetgen "
++ "that is KNOWN TO BE BUGGY on 64 bits archs and on WIN32/MSVC.")
++ elseif(ENABLE_TETGEN AND EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/contrib/Tetgen/tetgen.h)
++ add_subdirectory(contrib/Tetgen)
++ include_directories(contrib/Tetgen)
++ set_config_option(HAVE_TETGEN "Tetgen")
++ add_definitions(-DTETLIBRARY)
++ elseif(ENABLE_TETGEN)
++ find_library(TETGEN_LIB tet PATH_SUFFIXES lib)
++ find_path(TETGEN_INC "tetgen.h" PATH_SUFFIXES src include tetgen)
++ if(TETGEN_LIB AND TETGEN_INC)
++ list(APPEND EXTERNAL_LIBRARIES ${TETGEN_LIB})
++ list(APPEND EXTERNAL_INCLUDES ${TETGEN_INC})
++ set_config_option(HAVE_TETGEN "Tetgen")
++ endif(TETGEN_LIB AND TETGEN_INC)
++ endif(ENABLE_TETGEN_NEW AND EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/contrib/TetgenNew/tetgen.h)
++ if(HAVE_TETGEN)
++ message("WARNING: By including Tetgen you have to comply with Tetgen's "
++ "special licensing requirements stated in contrib/Tetgen/LICENSE.")
++ endif(HAVE_TETGEN)
++
++if(ENABLE_MED OR ENABLE_CGNS)
++ find_library(HDF5_LIB hdf5)
++ if(HDF5_LIB)
++ if(ENABLE_MED)
++ find_library(MED_LIB med)
++ if(MED_LIB)
++ set_config_option(HAVE_MED "Med")
++ list(APPEND EXTERNAL_LIBRARIES ${MED_LIB})
++ endif(MED_LIB)
++ endif(ENABLE_MED)
++ if(ENABLE_CGNS)
++ find_library(CGNS_LIB cgns PATHS ENV CGNS_ROOT PATH_SUFFIXES lib)
++ find_path(CGNS_INC "cgnslib.h" PATHS ENV CGNS_ROOT PATH_SUFFIXES include)
++ if(CGNS_LIB)
++ set_config_option(HAVE_LIBCGNS "Cgns")
++ list(APPEND EXTERNAL_LIBRARIES ${CGNS_LIB})
++ list(APPEND EXTERNAL_INCLUDES ${CGNS_INC})
++ endif(CGNS_LIB)
++ endif(ENABLE_CGNS)
++ if(MED_LIB OR CGNS_LIB)
++ list(APPEND EXTERNAL_LIBRARIES ${HDF5_LIB})
++ find_library(SZ_LIB NAMES szlib sz)
++ if(SZ_LIB)
++ list(APPEND EXTERNAL_LIBRARIES ${SZ_LIB})
++ endif(SZ_LIB)
++ if(NOT HAVE_LIBZ) # necessary for non-GUI builds
++ find_package(ZLIB)
++ if(ZLIB_FOUND)
++ set_config_option(HAVE_LIBZ "Zlib")
++ list(APPEND EXTERNAL_LIBRARIES ${ZLIB_LIBRARIES})
++ endif(ZLIB_FOUND)
++ endif(NOT HAVE_LIBZ)
++ endif(MED_LIB OR CGNS_LIB)
++ endif(HDF5_LIB)
++endif(ENABLE_MED OR ENABLE_CGNS)
++
++if(ENABLE_MESH)
++ set_config_option(HAVE_MESH "Mesh")
++endif(ENABLE_MESH)
++
++if(ENABLE_POST)
++ set_config_option(HAVE_POST "Post")
++ if(ENABLE_PLUGINS)
++ set_config_option(HAVE_PLUGINS "Plugins")
++ endif(ENABLE_PLUGINS)
++endif(ENABLE_POST)
++
++if(HAVE_FLTK OR HAVE_QT OR ENABLE_GRAPHICS)
++ if(NOT HAVE_MESH OR NOT HAVE_POST OR NOT HAVE_PLUGINS)
++ message(SEND_ERROR "Cannot compile GUI without Mesh, Post or Plugin modules")
++ endif(NOT HAVE_MESH OR NOT HAVE_POST OR NOT HAVE_PLUGINS)
++
++ if(FLTK_JPEG)
++ set_config_option(HAVE_LIBJPEG "Jpeg(Fltk)")
++ else(FLTK_JPEG)
++ find_package(JPEG)
++ if(JPEG_FOUND)
++ set_config_option(HAVE_LIBJPEG "Jpeg")
++ list(APPEND EXTERNAL_LIBRARIES ${JPEG_LIBRARIES})
++ list(APPEND EXTERNAL_INCLUDES ${JPEG_INCLUDE_DIR})
++ endif(JPEG_FOUND)
++ endif(FLTK_JPEG)
++
++ if(FLTK_Z)
++ set_config_option(HAVE_LIBZ "Zlib(Fltk)")
++ else(FLTK_Z)
++ find_package(ZLIB)
++ if(ZLIB_FOUND)
++ set_config_option(HAVE_LIBZ "Zlib")
++ list(APPEND EXTERNAL_LIBRARIES ${ZLIB_LIBRARIES})
++ list(APPEND EXTERNAL_INCLUDES ${ZLIB_INCLUDE_DIR})
++ endif(ZLIB_FOUND)
++ endif(FLTK_Z)
++
++ if(HAVE_LIBZ)
++ if(FLTK_PNG)
++ set_config_option(HAVE_LIBPNG "Png(Fltk)")
++ else(FLTK_PNG)
++ find_package(PNG)
++ if(PNG_FOUND)
++ set_config_option(HAVE_LIBPNG "Png")
++ list(APPEND EXTERNAL_LIBRARIES ${PNG_LIBRARIES})
++ list(APPEND EXTERNAL_INCLUDES ${PNG_INCLUDE_DIR})
++ endif(PNG_FOUND)
++ endif(FLTK_PNG)
++ endif(HAVE_LIBZ)
++
++ if(ENABLE_MPEG_ENCODE)
++ add_subdirectory(contrib/mpeg_encode)
++ include_directories(contrib/mpeg_encode/headers)
++ set_config_option(HAVE_MPEG_ENCODE "Mpeg")
++ endif(ENABLE_MPEG_ENCODE)
++
++ if(ENABLE_OSMESA)
++ find_library(OSMESA_LIB OSMesa)
++ if(OSMESA_LIB)
++ set_config_option(HAVE_OSMESA "OSMesa")
++ list(APPEND EXTERNAL_LIBRARIES ${OSMESA_LIB})
++ endif(OSMESA_LIB)
++ endif(ENABLE_OSMESA)
++
++ find_package(OpenGL REQUIRED)
++ if(OPENGL_GLU_FOUND)
++ set_config_option(HAVE_OPENGL "OpenGL")
++ else(OPENGL_GLU_FOUND)
++ message(SEND_ERROR "Could not find GLU: disabling OpenGL support")
++ endif(OPENGL_GLU_FOUND)
++endif(HAVE_FLTK OR HAVE_QT OR ENABLE_GRAPHICS)
++
++if(ENABLE_DINTEGRATION)
++ include_directories(../contrib/DiscreteIntegration)
++ set_config_option(HAVE_DINTEGRATION "DIntegration")
++endif(ENABLE_DINTEGRATION)
++
++# process cmake environment variables so we can append them to the -I
++# include commands. This is not recommended (we should only use the
++# cache variables) but it is very convenient: otherwise we have to
++# remember providing the -D... options to cmake for each new build.
++set(ENV_CMAKE_PREFIX_PATH $ENV{CMAKE_PREFIX_PATH})
++set(ENV_CMAKE_INCLUDE_PATH $ENV{CMAKE_INCLUDE_PATH})
++if(UNIX)
++ if(ENV_CMAKE_PREFIX_PATH)
++ string(REPLACE ":" ";" ENV_CMAKE_PREFIX_PATH ${ENV_CMAKE_PREFIX_PATH})
++ endif(ENV_CMAKE_PREFIX_PATH)
++ if(ENV_CMAKE_INCLUDE_PATH)
++ string(REPLACE ":" ";" ENV_CMAKE_INCLUDE_PATH ${ENV_CMAKE_INCLUDE_PATH})
++ endif(ENV_CMAKE_INCLUDE_PATH)
++endif(UNIX)
++list(APPEND EXTERNAL_INCLUDES ${CMAKE_INCLUDE_PATH} ${ENV_CMAKE_INCLUDE_PATH})
++list(APPEND EXTERNAL_INCLUDES ${CMAKE_PREFIX_PATH} ${ENV_CMAKE_PREFIX_PATH})
++foreach(DIR ${CMAKE_PREFIX_PATH} ${ENV_CMAKE_PREFIX_PATH})
++ list(APPEND EXTERNAL_INCLUDES ${DIR}/include)
++endforeach(DIR)
++
++if(EXTERNAL_INCLUDES)
++ list(REMOVE_DUPLICATES EXTERNAL_INCLUDES)
++endif(EXTERNAL_INCLUDES)
++
++if(HAVE_FLTK)
++ set(LINK_LIBRARIES ${FLTK_LIBRARIES} ${EXTERNAL_LIBRARIES}
++ ${OPENGL_LIBRARIES} ${LAPACK_LIBRARIES})
++elseif(HAVE_QT)
++ set(LINK_LIBRARIES ${QT_LIBRARIES} ${EXTERNAL_LIBRARIES}
++ ${OPENGL_LIBRARIES} ${LAPACK_LIBRARIES})
++elseif(HAVE_OPENGL)
++ set(LINK_LIBRARIES ${EXTERNAL_LIBRARIES} ${OPENGL_LIBRARIES}
++ ${LAPACK_LIBRARIES})
++else(HAVE_FLTK)
++ set(LINK_LIBRARIES ${EXTERNAL_LIBRARIES} ${LAPACK_LIBRARIES})
++endif(HAVE_FLTK)
++
++# set this for external codes that might include this CMakeList file
++set(GMSH_EXTERNAL_INCLUDE_DIRS ${EXTERNAL_INCLUDES} CACHE
++ STRING "External include directories" FORCE)
++set(GMSH_EXTERNAL_LIBRARIES ${EXTERNAL_LIBRARIES} CACHE
++ STRING "External libraries" FORCE)
++
++include_directories(${GMSH_EXTERNAL_INCLUDE_DIRS})
++
+ add_executable(mainAntTweakBar mainAntTweakBar.cpp)
+-target_link_libraries(mainAntTweakBar shared AntTweakBar ${glut})
++target_link_libraries(mainAntTweakBar ${LINK_LIBRARIES})
+
+ add_executable(mainCartesian mainCartesian.cpp)
+-target_link_libraries(mainCartesian shared)
++target_link_libraries(mainCartesian ${LINK_LIBRARIES})
+
+ add_executable(mainElasticity mainElasticity.cpp)
+-target_link_libraries(mainElasticity shared)
++target_link_libraries(mainElasticity ${LINK_LIBRARIES})
+
+ add_executable(mainGlut mainGlut.cpp)
+-target_link_libraries(mainGlut lib ${GMSH_EXTERNAL_LIBRARIES} ${glut})
++target_link_libraries(mainGlut ${glut} ${LINK_LIBRARIES})
+
+ add_executable(mainHomology mainHomology.cpp)
+-target_link_libraries(mainHomology shared)
++target_link_libraries(mainHomology ${LINK_LIBRARIES})
+
+ add_executable(mainLevelset mainLevelset.cpp)
+-target_link_libraries(mainLevelset shared)
++target_link_libraries(mainLevelset ${LINK_LIBRARIES})
+
+ add_executable(mainOcc mainOcc.cpp)
+-target_link_libraries(mainOcc shared)
++target_link_libraries(mainOcc ${LINK_LIBRARIES})
+
+ add_executable(mainPost mainPost.cpp)
+-target_link_libraries(mainPost shared)
++target_link_libraries(mainPost ${LINK_LIBRARIES})
+
+ add_executable(mainSimple mainSimple.cpp)
+-target_link_libraries(mainSimple shared)
++target_link_libraries(mainSimple ${LINK_LIBRARIES})
+
+--- a/utils/api_demos/mainAntTweakBar.cpp
++++ b/utils/api_demos/mainAntTweakBar.cpp
+@@ -14,6 +14,7 @@
+ #include "GModel.h"
+ #include "MElement.h"
+ #include "drawContext.h"
++#include <cstring>
+
+ static drawContext *ctx = 0;
+ static mousePosition clickPos, prevPos;
+--- a/utils/api_demos/mainCartesian.cpp
++++ b/utils/api_demos/mainCartesian.cpp
+@@ -12,7 +12,7 @@
+ #include "GmshMessage.h"
+ #include "cartesian.h"
+
+-static void insertActiveCells(double x, double y, double z, double rmax,
++static void my_insertActiveCells(double x, double y, double z, double rmax,
+ cartesianBox<double> &box)
+ {
+ int id1 = box.getCellContainingPoint(x - rmax, y - rmax, z - rmax);
+@@ -27,7 +27,7 @@
+ box.insertActiveCell(box.getCellIndex(i, j, k));
+ }
+
+-static void computeLevelset(GModel *gm, cartesianBox<double> &box)
++static void my_computeLevelset(GModel *gm, cartesianBox<double> &box)
+ {
+ // tolerance for desambiguation
+ const double tol = box.getLC() * 1.e-12;
+@@ -82,10 +82,10 @@
+ for (unsigned int j = 0; j < dist.size(); j++)
+ box.setNodalValue(indices[j], dist[j]);
+
+- if(box.getChildBox()) computeLevelset(gm, *box.getChildBox());
++ if(box.getChildBox()) my_computeLevelset(gm, *box.getChildBox());
+ }
+
+-static void fillPointCloud(GEdge *ge, double sampling, std::vector<SPoint3> &points)
++static void my_fillPointCloud(GEdge *ge, double sampling, std::vector<SPoint3> &points)
+ {
+ Range<double> t_bounds = ge->parBounds(0);
+ double t_min = t_bounds.low();
+@@ -99,7 +99,7 @@
+ }
+ }
+
+-static int removeBadChildCells(cartesianBox<double> *parent)
++static int my_removeBadChildCells(cartesianBox<double> *parent)
+ {
+ cartesianBox<double> *child = parent->getChildBox();
+ if(!child) return 0;
+@@ -135,10 +135,10 @@
+ (k != K - 1 && !parent->activeCellExists(parent->getCellIndex(i, j, k + 1)))))
+ for(int ii = 0; ii < 8; ii++) child->eraseActiveCell(idx[ii]);
+ }
+- return removeBadChildCells(child);
++ return my_removeBadChildCells(child);
+ }
+
+-static void removeParentCellsWithChildren(cartesianBox<double> *box)
++static void my_removeParentCellsWithChildren(cartesianBox<double> *box)
+ {
+ if(!box->getChildBox()) return;
+ for(int i = 0; i < box->getNxi(); i++)
+@@ -157,7 +157,7 @@
+ }
+ }
+ }
+- removeParentCellsWithChildren(box->getChildBox());
++ my_removeParentCellsWithChildren(box->getChildBox());
+ }
+
+ static void removeOutsideCells(cartesianBox<double> *box)
+@@ -226,7 +226,7 @@
+ double s = sampling / pow(2., levels - 1);
+ Msg::Info("Filling refined point cloud on curves and curved surfaces");
+ for (GModel::eiter eit = gm->firstEdge(); eit != gm->lastEdge(); eit++)
+- fillPointCloud(*eit, s, refinePoints);
++ my_fillPointCloud(*eit, s, refinePoints);
+
+ // FIXME: refine this by computing e.g. "mean" curvature
+ if(refineCurvedSurfaces){
+@@ -263,13 +263,13 @@
+ Msg::Info("Inserting active cells in the cartesian grid");
+ Msg::Info(" level %d", box.getLevel());
+ for (unsigned int i = 0; i < points.size(); i++)
+- insertActiveCells(points[i].x(), points[i].y(), points[i].z(), rmax, box);
++ my_insertActiveCells(points[i].x(), points[i].y(), points[i].z(), rmax, box);
+
+ cartesianBox<double> *parent = &box, *child;
+ while((child = parent->getChildBox())){
+ Msg::Info(" level %d", child->getLevel());
+ for(unsigned int i = 0; i < refinePoints.size(); i++)
+- insertActiveCells(refinePoints[i].x(), refinePoints[i].y(), refinePoints[i].z(),
++ my_insertActiveCells(refinePoints[i].x(), refinePoints[i].y(), refinePoints[i].z(),
+ rtube / pow(2., (levels - child->getLevel())), *child);
+ parent = child;
+ }
+@@ -278,8 +278,8 @@
+ // which there is no parent neighbor; then remove parent cells that
+ // have children
+ Msg::Info("Removing cells to match X-FEM mesh topology constraints");
+- removeBadChildCells(&box);
+- removeParentCellsWithChildren(&box);
++ my_removeBadChildCells(&box);
++ my_removeParentCellsWithChildren(&box);
+
+ // we generate duplicate nodes at this point so we can easily access
+ // cell values at each level; we will clean up by renumbering after
+@@ -288,7 +288,7 @@
+ box.createNodalValues();
+
+ Msg::Info("Computing levelset on the cartesian grid");
+- computeLevelset(gm, box);
++ my_computeLevelset(gm, box);
+
+ Msg::Info("Removing cells outside the structure");
+ removeOutsideCells(&box);
+--- a/utils/api_demos/mainElasticity.cpp
++++ b/utils/api_demos/mainElasticity.cpp
+@@ -3,6 +3,7 @@
+ #include "elasticitySolver.h"
+ #include "PView.h"
+ #include "PViewData.h"
++#include <cstring>
+
+ void Info (int i, char* c){
+ printf("%d %s\n",i,c);
Added: packages/gmsh-tetgen/trunk/debian/patches/cgns.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/gmsh-tetgen/trunk/debian/patches/cgns.patch?rev=44743&op=file
==============================================================================
--- packages/gmsh-tetgen/trunk/debian/patches/cgns.patch (added)
+++ packages/gmsh-tetgen/trunk/debian/patches/cgns.patch Fri Apr 27 07:09:04 2012
@@ -1,0 +1,196 @@
+Index: gmsh-2.5.1~beta2~svn11641~dfsg-1/Geo/GModelIO_CGNS.cpp
+===================================================================
+--- gmsh-2.5.1~beta2~svn11641~dfsg-1.orig/Geo/GModelIO_CGNS.cpp 2012-03-15 10:35:16.000000000 +0100
++++ gmsh-2.5.1~beta2~svn11641~dfsg-1/Geo/GModelIO_CGNS.cpp 2012-03-15 11:45:53.000000000 +0100
+@@ -155,24 +155,24 @@
+ // 1D second-order elements
+ // MSH_NUM_TYPE+1 is used to place non-cgns elements last.
+ static const int msh2cgns[MSH_NUM_TYPE][2] = {
+- {BAR_2, 16},
+- {TRI_3, 11},
+- {QUAD_4, 12},
+- {TETRA_4, 1},
+- {HEXA_8, 4},
+- {PENTA_6, 3},
+- {PYRA_5, 2},
+- {BAR_3, 17},
+- {TRI_6, 13},
+- {QUAD_9, 15},
+- {TETRA_10, 5},
+- {HEXA_27, 10},
+- {PENTA_18, 8},
+- {PYRA_14, 6},
++ {CGNS_ENUMV(BAR_2), 16},
++ {CGNS_ENUMV(TRI_3), 11},
++ {CGNS_ENUMV(QUAD_4), 12},
++ {CGNS_ENUMV(TETRA_4), 1},
++ {CGNS_ENUMV(HEXA_8), 4},
++ {CGNS_ENUMV(PENTA_6), 3},
++ {CGNS_ENUMV(PYRA_5), 2},
++ {CGNS_ENUMV(BAR_3), 17},
++ {CGNS_ENUMV(TRI_6), 13},
++ {CGNS_ENUMV(QUAD_9), 15},
++ {CGNS_ENUMV(TETRA_10), 5},
++ {CGNS_ENUMV(HEXA_27), 10},
++ {CGNS_ENUMV(PENTA_18), 8},
++ {CGNS_ENUMV(PYRA_14), 6},
+ {-1, MSH_NUM_TYPE+1}, // MSH_PNT (NODE in CGNS but not used herein)
+- {QUAD_8, 14},
+- {HEXA_20, 9},
+- {PENTA_15, 7},
++ {CGNS_ENUMV(QUAD_8), 14},
++ {CGNS_ENUMV(HEXA_20), 9},
++ {CGNS_ENUMV(PENTA_15), 7},
+ {-1, MSH_NUM_TYPE+1}, // MSH_PYR_13
+ {-1, MSH_NUM_TYPE+1}, // MSH_TRI_9
+ {-1, MSH_NUM_TYPE+1}, // MSH_TRI_10
+@@ -587,9 +587,9 @@
+ for (int index_zone = 1; index_zone <= nZones; index_zone++) {
+ Msg::Debug("Reading zone to compute MG level %i.", index_zone);
+
+- ZoneType_t zoneType;
++ CGNS_ENUMT(ZoneType_t) zoneType;
+ cg_zone_type(index_file, index_base, index_zone, &zoneType);
+- if ( zoneType == Unstructured ) {
++ if ( zoneType == CGNS_ENUMV( Unstructured ) ) {
+ Msg::Debug("Unstructured zone detected, skipping.");
+ continue;
+ }
+@@ -644,9 +644,9 @@
+
+ int offset = vnum;
+
+- ZoneType_t zoneType;
++ CGNS_ENUMT( ZoneType_t ) zoneType;
+ cg_zone_type(index_file, index_base, index_zone, &zoneType);
+- if ( zoneType == Unstructured ) {
++ if ( zoneType == CGNS_ENUMV( Unstructured ) ) {
+ Msg::Debug("Unstructured zone detected, skipping.");
+ continue;
+ }
+@@ -680,7 +680,7 @@
+ int nCoords;
+ cg_ncoords(index_file, index_base, index_zone, &nCoords);
+
+- DataType_t dataType;
++ CGNS_ENUMT( DataType_t ) dataType;
+ char coordName[35];
+ void* coord;
+ double nodes[nnodesZone][nCoords];
+@@ -695,7 +695,7 @@
+ Msg::Debug("Reading coordinate %i : %s.", iCoord+1, coordName);
+
+ switch(dataType) {
+- case RealSingle:
++ case CGNS_ENUMV(RealSingle):
+ Msg::Debug(" [Type is float]");
+ coord = new float[nnodesZone];
+ if ( cg_coord_read(index_file, index_base, index_zone, coordName, dataType, irmin, irmax, coord)) {
+@@ -708,7 +708,7 @@
+ }
+ delete [] (float*)coord;
+ break;
+- case RealDouble:
++ case CGNS_ENUMV(RealDouble):
+ Msg::Debug(" [Type is double]");
+ coord = new double[nnodesZone];
+ if ( cg_coord_read(index_file, index_base, index_zone, coordName, dataType, irmin, irmax, coord)) {
+@@ -1490,8 +1490,9 @@
+ ZoneTask() : status(0), indexInOwner(0) { }
+ void change_status(const int _status)
+ {
+-#pragma omp atomic
+- status = _status;
++ //invalid pragma =
++ //#pragma omp atomic
++ status = _status;
+ }
+ };
+
+@@ -1582,7 +1583,7 @@
+ cgZoneSize[2] = writeZone->numBoVert; // Number of boundary vertices
+ if(cg_zone_write(cgIndexFile, cgIndexBase,
+ writeTask->zoneName.c_str(), cgZoneSize,
+- Unstructured, &cgIndexZone))
++ CGNS_ENUMV( Unstructured ), &cgIndexZone))
+ {
+ return cgnsErr();
+ }
+@@ -1609,7 +1610,7 @@
+ for (int i = 0; i != cgZoneSize[0]; ++i) {
+ dBuffer[i] = writeZone->zoneVertVec[i]->x()*scalingFactor;
+ }
+- if(cg_coord_write(cgIndexFile, cgIndexBase, cgIndexZone, RealDouble,
++ if(cg_coord_write(cgIndexFile, cgIndexBase, cgIndexZone, CGNS_ENUMV( RealDouble ),
+ "CoordinateX", &dBuffer[0], &cgIndexCoord))
+ return cgnsErr();
+
+@@ -1617,7 +1618,7 @@
+ for(int i = 0; i != cgZoneSize[0]; ++i) {
+ dBuffer[i] = writeZone->zoneVertVec[i]->y()*scalingFactor;
+ }
+- if(cg_coord_write(cgIndexFile, cgIndexBase, cgIndexZone, RealDouble,
++ if(cg_coord_write(cgIndexFile, cgIndexBase, cgIndexZone, CGNS_ENUMV( RealDouble ),
+ "CoordinateY", &dBuffer[0], &cgIndexCoord))
+ return cgnsErr();
+
+@@ -1626,7 +1627,7 @@
+ for(int i = 0; i != cgZoneSize[0]; ++i) {
+ dBuffer[i] = writeZone->zoneVertVec[i]->z()*scalingFactor;
+ }
+- if(cg_coord_write(cgIndexFile, cgIndexBase, cgIndexZone, RealDouble,
++ if(cg_coord_write(cgIndexFile, cgIndexBase, cgIndexZone, CGNS_ENUMV( RealDouble ),
+ "CoordinateZ", &dBuffer[0], &cgIndexCoord))
+ return cgnsErr();
+ }
+@@ -1706,7 +1707,7 @@
+ int cgIndexSection;
+ if(cg_section_write
+ (cgIndexFile, cgIndexBase, cgIndexZone, elemName,
+- static_cast<ElementType_t>(typeCGNS), iElemSection + 1,
++ static_cast<CGNS_ENUMT( ElementType_t )>(typeCGNS), iElemSection + 1,
+ writeZone->zoneElemConn[typeMSHm1].numElem + iElemSection,
+ writeZone->zoneElemConn[typeMSHm1].numBoElem + iElemSection,
+ (cgsize_t*)&writeZone->zoneElemConn[typeMSHm1].connectivity[0],
+@@ -1746,9 +1747,9 @@
+ // In the first zone
+ if(cg_conn_write
+ (cgIndexFile, cgIndexBase, zoneInfo[gCIt->first.zone1].cgIndex,
+- interfaceName.c_str(), Vertex, Abutting1to1, PointList, nVert,
++ interfaceName.c_str(), CGNS_ENUMV(Vertex), CGNS_ENUMV(Abutting1to1), CGNS_ENUMV(PointList), nVert,
+ &iBuffer1[0], zoneInfo[gCIt->first.zone2].name.c_str(),
+- Unstructured, PointListDonor, Integer, nVert, &iBuffer2[0],
++ CGNS_ENUMV(Unstructured), CGNS_ENUMV(PointListDonor), CGNS_ENUMV(Integer), nVert, &iBuffer2[0],
+ &cgIndexInterface))
+ {
+ return cgnsErr();
+@@ -1756,9 +1757,9 @@
+ // In the second zone
+ if(cg_conn_write
+ (cgIndexFile, cgIndexBase, zoneInfo[gCIt->first.zone2].cgIndex,
+- interfaceName.c_str(), Vertex, Abutting1to1, PointList, nVert,
++ interfaceName.c_str(), CGNS_ENUMV(Vertex), CGNS_ENUMV(Abutting1to1), CGNS_ENUMV(PointList), nVert,
+ &iBuffer2[0], zoneInfo[gCIt->first.zone1].name.c_str(),
+- Unstructured, PointListDonor, Integer, nVert, &iBuffer1[0],
++ CGNS_ENUMV(Unstructured), CGNS_ENUMV(PointListDonor), CGNS_ENUMV(Integer), nVert, &iBuffer1[0],
+ &cgIndexInterface))
+ {
+ return cgnsErr();
+@@ -1878,7 +1879,7 @@
+ }
+ if(cg_boco_write(cgIndexFile, cgIndexBase,
+ zoneInfo[zoneIndex].cgIndex, patchName.c_str(),
+- BCTypeNull, PointList, numBCVert, &iBuffer1[0],
++ CGNS_ENUMV( BCTypeNull ), CGNS_ENUMV( PointList ), numBCVert, &iBuffer1[0],
+ &cgIndexBoco))
+ {
+ return cgnsErr();
+@@ -1888,7 +1889,7 @@
+ int normalIndex;
+ if(cg_boco_normal_write(cgIndexFile, cgIndexBase,
+ zoneInfo[zoneIndex].cgIndex, cgIndexBoco,
+- &normalIndex, 1, RealDouble, &dBuffer[0]))
++ &normalIndex, 1, CGNS_ENUMV( RealDouble ), &dBuffer[0]))
+ {
+ return cgnsErr();
+ }
Added: packages/gmsh-tetgen/trunk/debian/patches/change_shared_library_name.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/gmsh-tetgen/trunk/debian/patches/change_shared_library_name.patch?rev=44743&op=file
==============================================================================
--- packages/gmsh-tetgen/trunk/debian/patches/change_shared_library_name.patch (added)
+++ packages/gmsh-tetgen/trunk/debian/patches/change_shared_library_name.patch Fri Apr 27 07:09:04 2012
@@ -1,0 +1,24 @@
+Description: Change name of shared library
+Author: Anton Gladky <gladky.anton at gmail.com>
+Last-Update: 2011-12-09
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -1006,7 +1006,7 @@
+ # want to build the lib we need to recompile everything (the first
+ # time--it's a separate target)
+ add_library(lib STATIC EXCLUDE_FROM_ALL ${GMSH_SRC})
+-set_target_properties(lib PROPERTIES OUTPUT_NAME Gmsh)
++set_target_properties(lib PROPERTIES OUTPUT_NAME gmsh)
+ if(MSVC)
+ set_target_properties(lib PROPERTIES DEBUG_POSTFIX d)
+ if(ENABLE_MSVC_STATIC_RUNTIME)
+@@ -1016,7 +1016,7 @@
+
+ # shared library target: we don't build it by default either
+ add_library(shared SHARED EXCLUDE_FROM_ALL ${GMSH_SRC})
+-set_target_properties(shared PROPERTIES OUTPUT_NAME Gmsh)
++set_target_properties(shared PROPERTIES OUTPUT_NAME gmsh1)
+ if(HAVE_LAPACK AND LAPACK_FLAGS)
+ set_target_properties(shared PROPERTIES LINK_FLAGS ${LAPACK_FLAGS})
+ endif(HAVE_LAPACK AND LAPACK_FLAGS)
Added: packages/gmsh-tetgen/trunk/debian/patches/delete_gl2ps_from_source.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/gmsh-tetgen/trunk/debian/patches/delete_gl2ps_from_source.patch?rev=44743&op=file
==============================================================================
--- packages/gmsh-tetgen/trunk/debian/patches/delete_gl2ps_from_source.patch (added)
+++ packages/gmsh-tetgen/trunk/debian/patches/delete_gl2ps_from_source.patch Fri Apr 27 07:09:04 2012
@@ -1,0 +1,25 @@
+Description: delete gl2ps and use packaged version.
+Author: Anton Gladky <gladky.anton at gmail.com>, Julian Taylor <jtaylor.debian at googlemail.com>
+Last-Update: 2011-12-09
+
+--- a/Graphics/CMakeLists.txt
++++ b/Graphics/CMakeLists.txt
+@@ -15,7 +15,6 @@
+ drawScales.cpp
+ drawGraph2d.cpp
+ drawGlyph.cpp
+- gl2ps.cpp
+ gl2gif.cpp
+ gl2jpeg.cpp
+ gl2png.cpp
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -1039,7 +1039,7 @@
+ add_executable(gmsh_dynamic EXCLUDE_FROM_ALL Common/Main.cpp)
+ target_link_libraries(gmsh_dynamic shared)
+ endif(HAVE_FLTK)
+-target_link_libraries(gmsh ${LINK_LIBRARIES})
++target_link_libraries(gmsh ${LINK_LIBRARIES} -lgl2ps -lGL -lglut)
+
+ # increase stack to 16Mb on Windows to avoid overflows in recursive
+ # tet classification for large 3D Delaunay grids + force static
Added: packages/gmsh-tetgen/trunk/debian/patches/fix_FTBFS_linking.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/gmsh-tetgen/trunk/debian/patches/fix_FTBFS_linking.patch?rev=44743&op=file
==============================================================================
--- packages/gmsh-tetgen/trunk/debian/patches/fix_FTBFS_linking.patch (added)
+++ packages/gmsh-tetgen/trunk/debian/patches/fix_FTBFS_linking.patch Fri Apr 27 07:09:04 2012
@@ -1,0 +1,15 @@
+Description: this linking causes a FTBFS
+Author: Anton Gladky <gladky.anton at gmail.com>
+Last-Update: 2012-04-08
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -1033,7 +1033,7 @@
+ message("WARNING: By enabling ENABLE_MSVC_STATIC_RUNTIME, shared library wont link. "
+ "Change in msvc /MT flag to /MD in the shared project properties")
+ endif(MSVC AND ENABLE_MSVC_STATIC_RUNTIME)
+-target_link_libraries(shared ${LINK_LIBRARIES})
++target_link_libraries(shared ${LINK_LIBRARIES} -shared -lgl2ps -lGL -lglut)
+
+ # binary targets
+ if(HAVE_FLTK)
Added: packages/gmsh-tetgen/trunk/debian/patches/fix_spelling_errors.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/gmsh-tetgen/trunk/debian/patches/fix_spelling_errors.patch?rev=44743&op=file
==============================================================================
--- packages/gmsh-tetgen/trunk/debian/patches/fix_spelling_errors.patch (added)
+++ packages/gmsh-tetgen/trunk/debian/patches/fix_spelling_errors.patch Fri Apr 27 07:09:04 2012
@@ -1,0 +1,59 @@
+Desctiption: fixes some spelling errors
+Author: Anton Gladky <gladky.anton at gmail.com>
+Last-Update: 2011-12-09
+
+--- a/Plugin/Bubbles.cpp
++++ b/Plugin/Bubbles.cpp
+@@ -30,7 +30,7 @@
+ {
+ return "Plugin(Bubbles) constructs a geometry consisting of "
+ "`bubbles' inscribed in the Voronoi of an input triangulation. "
+- "`ShrinkFactor' allows to change the size of the bubbles. "
++ "`ShrinkFactor' allows one to change the size of the bubbles. "
+ "The plugin expects a triangulation in the `z = 0' plane to exist "
+ "in the current model.\n\n"
+ "Plugin(Bubbles) creates one `.geo' file.";
+--- a/contrib/lbfgs/alglibinternal.cpp
++++ b/contrib/lbfgs/alglibinternal.cpp
+@@ -3679,8 +3679,8 @@
+ {
+ return;
+ }
+- ae_assert(j2-j1==ix2-ix1, "MatrixVectorMultiply: A and X dont match!", _state);
+- ae_assert(i2-i1==iy2-iy1, "MatrixVectorMultiply: A and Y dont match!", _state);
++ ae_assert(j2-j1==ix2-ix1, "MatrixVectorMultiply: A and X don't match!", _state);
++ ae_assert(i2-i1==iy2-iy1, "MatrixVectorMultiply: A and Y don't match!", _state);
+
+ /*
+ * beta*y
+@@ -3716,8 +3716,8 @@
+ {
+ return;
+ }
+- ae_assert(i2-i1==ix2-ix1, "MatrixVectorMultiply: A and X dont match!", _state);
+- ae_assert(j2-j1==iy2-iy1, "MatrixVectorMultiply: A and Y dont match!", _state);
++ ae_assert(i2-i1==ix2-ix1, "MatrixVectorMultiply: A and X don't match!", _state);
++ ae_assert(j2-j1==iy2-iy1, "MatrixVectorMultiply: A and Y don't match!", _state);
+
+ /*
+ * beta*y
+--- a/doc/texinfo/gmsh.texi
++++ b/doc/texinfo/gmsh.texi
+@@ -1398,7 +1398,7 @@
+ etc.). The eigth case permits to use the value of a @var{char-option} as
+ a @var{char-expression}. The ninth case gets the value of an environment
+ variable from the operating system. The last case in the definition
+-allows to ask the user for a value interactively. The various
++allows one to ask the user for a value interactively. The various
+ @w{@var{char-option}s} are listed in @ref{Options}.
+
+ Character expressions are mostly used to specify non-numeric options and
+@@ -2922,7 +2922,7 @@
+ @item Extrude @{ Surface @{ @var{expression-list} @}; @var{layers} < Using Index[@var{expr}]; > < Using View[@var{expr}]; > @}
+ Extrudes a boundary layer from the specified surfaces. If no view is
+ specified, the boundary layer is created using gouraud-shaped (smoothed)
+-normal field. Specifying a boundary layer index allows to extrude
++normal field. Specifying a boundary layer index allows one to extrude
+ several independent boundary layers (with independent normal smoothing).
+
+ @item Transfinite Line @{ @var{expression-list} @} | "*" = @var{expression} < Using Progression | Bump @var{expression} >;
Added: packages/gmsh-tetgen/trunk/debian/patches/metis.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/gmsh-tetgen/trunk/debian/patches/metis.patch?rev=44743&op=file
==============================================================================
--- packages/gmsh-tetgen/trunk/debian/patches/metis.patch (added)
+++ packages/gmsh-tetgen/trunk/debian/patches/metis.patch Fri Apr 27 07:09:04 2012
@@ -1,0 +1,13 @@
+Index: gmsh-tetgen-2.5.1~beta2~svn11941/contrib/Metis/util.c
+===================================================================
+--- gmsh-tetgen-2.5.1~beta2~svn11941.orig/contrib/Metis/util.c 2012-04-26 13:45:22.000000000 +0200
++++ gmsh-tetgen-2.5.1~beta2~svn11941/contrib/Metis/util.c 2012-04-26 15:55:26.000000000 +0200
+@@ -28,7 +28,7 @@
+
+ sprintf(out2, "Error! %s", out1);
+
+- fprintf(stdout, out2);
++ fprintf(stdout, "%s", out2);
+ fflush(stdout);
+
+ abort();
Added: packages/gmsh-tetgen/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/debian-science/packages/gmsh-tetgen/trunk/debian/patches/series?rev=44743&op=file
==============================================================================
--- packages/gmsh-tetgen/trunk/debian/patches/series (added)
+++ packages/gmsh-tetgen/trunk/debian/patches/series Fri Apr 27 07:09:04 2012
@@ -1,0 +1,11 @@
+change_shared_library_name.patch
+skip_license_file.patch
+fix_spelling_errors.patch
+delete_gl2ps_from_source.patch
+switch_from_opencascade_to_oce.patch
+api_demos.patch
+fix_FTBFS_linking.patch
+Alauzet.patch
+cgns.patch
+add-missing-headers.patch
+metis.patch
Added: packages/gmsh-tetgen/trunk/debian/patches/skip_license_file.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/gmsh-tetgen/trunk/debian/patches/skip_license_file.patch?rev=44743&op=file
==============================================================================
--- packages/gmsh-tetgen/trunk/debian/patches/skip_license_file.patch (added)
+++ packages/gmsh-tetgen/trunk/debian/patches/skip_license_file.patch Fri Apr 27 07:09:04 2012
@@ -1,0 +1,24 @@
+Description: skips LICENSE.txt during installation. All information is in debian/copyright.
+Author: Anton Gladky <gladky.anton at gmail.com>
+Last-Update: 2011-12-09
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -1087,7 +1087,7 @@
+ endif(UNIX)
+
+ set(WELCOME_FILE ${CMAKE_CURRENT_SOURCE_DIR}/doc/WELCOME.txt)
+-set(LICENSE_FILE ${CMAKE_CURRENT_SOURCE_DIR}/doc/LICENSE.txt)
++#set(LICENSE_FILE ${CMAKE_CURRENT_SOURCE_DIR}/doc/LICENSE.txt)
+ set(CREDITS_FILE ${CMAKE_CURRENT_SOURCE_DIR}/doc/CREDITS.txt)
+ file(GLOB TUTORIAL_FILES ${CMAKE_CURRENT_SOURCE_DIR}/tutorial/?*.*)
+ file(GLOB DEMO_FILES ${CMAKE_CURRENT_SOURCE_DIR}/demos/?*.*)
+@@ -1182,7 +1182,7 @@
+ if(MAKEINFO AND TEXI2PDF)
+ add_custom_target(doc COMMAND ${CMAKE_COMMAND} -E tar zcf
+ ${CMAKE_CURRENT_BINARY_DIR}/gmsh-${GMSH_VERSION}-doc.tgz
+- doc/CREDITS.txt doc/LICENSE.txt doc/VERSIONS.txt
++ doc/CREDITS.txt doc/VERSIONS.txt
+ doc/gmsh.1 doc/texinfo/gmsh.html doc/texinfo/gmsh.info
+ doc/texinfo/gmsh.pdf doc/texinfo/gmsh.txt
+ COMMAND ${CMAKE_COMMAND} -E remove ${TEX_OBJ}
Added: packages/gmsh-tetgen/trunk/debian/patches/switch_from_opencascade_to_oce.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/gmsh-tetgen/trunk/debian/patches/switch_from_opencascade_to_oce.patch?rev=44743&op=file
==============================================================================
--- packages/gmsh-tetgen/trunk/debian/patches/switch_from_opencascade_to_oce.patch (added)
+++ packages/gmsh-tetgen/trunk/debian/patches/switch_from_opencascade_to_oce.patch Fri Apr 27 07:09:04 2012
@@ -1,0 +1,63 @@
+Description: switch from opencascade to oce
+Origin: http://www.geuz.org/pipermail/gmsh/2011/006731.html
+Author: D. Barbier <bouzim at gmail.com>
+Reviewed-by: Anton Gladky <gladky.anton at gmail.com>
+Last-Update: 2012-02-10
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -804,15 +804,6 @@
+ endif(HAVE_SOLVER)
+
+ if(ENABLE_OCC)
+- if(WIN32 OR CYGWIN)
+- if(HAVE_64BIT_SIZE_T)
+- set(OCC_SYS_NAME win64)
+- else(HAVE_64BIT_SIZE_T)
+- set(OCC_SYS_NAME win32)
+- endif(HAVE_64BIT_SIZE_T)
+- else(WIN32 OR CYGWIN)
+- set(OCC_SYS_NAME ${CMAKE_SYSTEM_NAME})
+- endif(WIN32 OR CYGWIN)
+ set(OCC_LIBS_REQUIRED
+ # subset of DataExchange
+ TKSTEP TKSTEP209 TKSTEPAttr TKSTEPBase TKIGES TKXSBase
+@@ -823,6 +814,30 @@
+ TKBRep TKGeomBase TKG3d TKG2d
+ # FoundationClasses
+ TKAdvTools TKMath TKernel)
++ # First try to detect OpenCascade Community Edition, based on CMake
++ find_package(OCE QUIET COMPONENTS ${OCC_LIBS_REQUIRED})
++ if(OCE_ALL_FOUND)
++ list(APPEND EXTERNAL_LIBRARIES ${OCC_LIBS_REQUIRED})
++ list(APPEND EXTERNAL_INCLUDES ${OCE_INCLUDE_DIRS})
++ set_config_option(HAVE_OCC "OpenCascade(OCE)")
++ add_definitions(-DHAVE_NO_OCC_CONFIG_H)
++ if(HAVE_64BIT_SIZE_T)
++ add_definitions(-D_OCC64)
++ endif(HAVE_64BIT_SIZE_T)
++ if(CYGWIN)
++ list(APPEND EXTERNAL_LIBRARIES "winspool")
++ elseif(MSVC)
++ add_definitions(-DWNT)
++ endif(CYGWIN)
++ else(OCE_ALL_FOUND)
++ if(OCE_FOUND)
++ message(STATUS "Found OCE version ${OCE_VERSION}, but those libraries are missing: " ${OCE_MISSING_TOOLKITS})
++ endif(OCE_FOUND)
++ if(WIN32 OR CYGWIN)
++ set(OCC_SYS_NAME win32)
++ else(WIN32 OR CYGWIN)
++ set(OCC_SYS_NAME ${CMAKE_SYSTEM_NAME})
++ endif(WIN32 OR CYGWIN)
+ list(LENGTH OCC_LIBS_REQUIRED NUM_OCC_LIBS_REQUIRED)
+ set(OCC_LIBS)
+ foreach(OCC ${OCC_LIBS_REQUIRED})
+@@ -859,6 +874,7 @@
+ endif(NOT OCC_CONFIG_H)
+ endif(OCC_INC)
+ endif(NUM_OCC_LIBS EQUAL NUM_OCC_LIBS_REQUIRED)
++ endif(OCE_ALL_FOUND)
+ if(HAVE_OCC AND ENABLE_SALOME)
+ add_subdirectory(contrib/Salome)
+ include_directories(contrib/Salome)
Added: packages/gmsh-tetgen/trunk/debian/patches/tetgen-1.4.3.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/gmsh-tetgen/trunk/debian/patches/tetgen-1.4.3.patch?rev=44743&op=file
==============================================================================
--- packages/gmsh-tetgen/trunk/debian/patches/tetgen-1.4.3.patch (added)
+++ packages/gmsh-tetgen/trunk/debian/patches/tetgen-1.4.3.patch Fri Apr 27 07:09:04 2012
@@ -1,0 +1,14 @@
+Index: gmsh-2.5.1~beta2~svn11503~dfsg/CMakeLists.txt
+===================================================================
+--- gmsh-2.5.1~beta2~svn11503~dfsg.orig/CMakeLists.txt 2012-03-01 09:15:22.000000000 +0100
++++ gmsh-2.5.1~beta2~svn11503~dfsg/CMakeLists.txt 2012-03-01 09:16:35.000000000 +0100
+@@ -600,6 +600,9 @@
+ list(APPEND EXTERNAL_LIBRARIES ${TETGEN_LIB})
+ list(APPEND EXTERNAL_INCLUDES ${TETGEN_INC})
+ set_config_option(HAVE_TETGEN "Tetgen")
++ #
++ # how to check version ?? to eventally add -DTETLIBRARY flag
++ add_definitions(-DTETLIBRARY)
+ endif(TETGEN_LIB AND TETGEN_INC)
+ endif(ENABLE_TETGEN_NEW AND EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/contrib/TetgenNew/tetgen.h)
+ if(HAVE_TETGEN)
Added: packages/gmsh-tetgen/trunk/debian/postinst
URL: http://svn.debian.org/wsvn/debian-science/packages/gmsh-tetgen/trunk/debian/postinst?rev=44743&op=file
==============================================================================
--- packages/gmsh-tetgen/trunk/debian/postinst (added)
+++ packages/gmsh-tetgen/trunk/debian/postinst Fri Apr 27 07:09:04 2012
@@ -1,0 +1,11 @@
+#! /bin/sh
+
+set -e
+
+if [ "$1" = "configure" ] ; then
+ ldconfig
+fi
+
+#DEBHELPER#
+
+exit 0;
Added: packages/gmsh-tetgen/trunk/debian/postrm
URL: http://svn.debian.org/wsvn/debian-science/packages/gmsh-tetgen/trunk/debian/postrm?rev=44743&op=file
==============================================================================
--- packages/gmsh-tetgen/trunk/debian/postrm (added)
+++ packages/gmsh-tetgen/trunk/debian/postrm Fri Apr 27 07:09:04 2012
@@ -1,0 +1,11 @@
+#! /bin/sh
+
+set -e
+
+if [ "$1" = "remove" ]; then
+ ldconfig
+fi
+
+#DEBHELPER#
+
+exit 0;
Added: packages/gmsh-tetgen/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-science/packages/gmsh-tetgen/trunk/debian/rules?rev=44743&op=file
==============================================================================
--- packages/gmsh-tetgen/trunk/debian/rules (added)
+++ packages/gmsh-tetgen/trunk/debian/rules Fri Apr 27 07:09:04 2012
@@ -1,0 +1,64 @@
+#!/usr/bin/make -f
+BUILDDIR = $(CURDIR)/debian/build
+
+%:
+ dh $@ --buildsystem=cmake --builddirectory=$(BUILDDIR) --with python2 --parallel
+
+export OMPI_MCA_plm_rsh_agent=/bin/false #workaround to start MPI-applications in chroot
+
+extra_flags += \
+-DCMAKE_CXX_FLAGS="-DMPICH_SKIP_MPICXX -DOMPI_SKIP_MPICXX -fopenmp -lmpi -fPIC \
+ -Wall $(shell dpkg-buildflags --get CXXFLAGS)" \
+-DCMAKE_C_FLAGS="-fPIC -Wall $(shell dpkg-buildflags --get CFLAGS)" \
+-DCMAKE_INCLUDE_PATH:STRING="/usr/include/mpi" \
+-DPYTHON_EXECUTABLE:FILEPATH=/usr/bin/python2.7 \
+-DPYTHON_INCLUDE_DIR:PATH=/usr/include/python2.7 \
+-DPYTHON_LIBRARY:FILEPATH=/usr/lib/libpython2.7.so \
+-DENABLE_METIS:BOOL=ON \
+-DENABLE_TAUCS:BOOL=ON \
+-DENABLE_MPI:BOOL=ON \
+-DENABLE_OSMESA:BOOL=OFF \
+-DENABLE_CGNS:BOOL=OFF
+
+# PETSC_DIR is the location of PETSc.
+export PETSC_DIR=/usr/lib/petscdir/3.2
+export PETSC_ARCH=linux-gnu-c-opt
+export SLEPC_DIR=/usr/lib/slepcdir/3.2
+
+override_dh_auto_clean:
+ rm -rf $(BUILDDIR)
+ rm -f doc/texinfo/gmsh.vr
+ rm -f doc/texinfo/gmsh.fn
+ rm -f doc/texinfo/gmsh.ky
+ rm -f doc/texinfo/gmsh.pg
+ rm -f doc/texinfo/gmsh.toc
+ rm -f doc/texinfo/gmsh.log
+ rm -f doc/texinfo/gmsh.cp
+ rm -f doc/texinfo/gmsh.tp
+ rm -f doc/texinfo/gmsh.tps
+ rm -f doc/texinfo/gmsh.cps
+ rm -f doc/texinfo/gmsh.aux
+ rm -f doc/texinfo/gmsh.html
+ rm -f doc/texinfo/gmsh.pdf
+ rm -f doc/texinfo/gmsh.info
+
+override_dh_auto_configure:
+ dh_auto_configure -- $(extra_flags)
+
+override_dh_auto_build:
+ dh_auto_build
+ # To avoid the texi2dvi pb add LC_ALL=C
+ dh_auto_build -- pdf html info LC_ALL=C
+ chrpath -d $(BUILDDIR)/wrappers/gmshpy/*.so
+
+override_dh_auto_test:
+ mkdir test-dir
+ cp demos/transfinite.geo test-dir
+ cd test-dir; $(BUILDDIR)/gmsh transfinite.geo -2 -o transfinite2d.mesh
+ cd test-dir; $(BUILDDIR)/gmsh transfinite.geo -3 -o transfinite3d.mesh
+ cd test-dir; $(BUILDDIR)/gmsh transfinite.geo -2 -o transfinite2d.msh
+ cd test-dir; $(BUILDDIR)/gmsh transfinite.geo -3 -o transfinite3d.msh
+ cd test-dir; $(BUILDDIR)/gmsh transfinite.geo -2 -o transfinite2d.stl
+ cd test-dir; $(BUILDDIR)/gmsh transfinite.geo -3 -o transfinite3d.stl
+ cd test-dir; ls -ln;
+ rm -rf test-dir
Propchange: packages/gmsh-tetgen/trunk/debian/rules
------------------------------------------------------------------------------
svn:executable = *
Added: packages/gmsh-tetgen/trunk/debian/scripts/get_orig.py
URL: http://svn.debian.org/wsvn/debian-science/packages/gmsh-tetgen/trunk/debian/scripts/get_orig.py?rev=44743&op=file
==============================================================================
--- packages/gmsh-tetgen/trunk/debian/scripts/get_orig.py (added)
+++ packages/gmsh-tetgen/trunk/debian/scripts/get_orig.py Fri Apr 27 07:09:04 2012
@@ -1,0 +1,43 @@
+#!/usr/bin/python
+# -*- coding: utf-8 -*-
+
+# The script creates a tar.xz tarball from svn-repository of GMSH
+# atool, subversion
+
+
+import os, sys
+
+os.system('rm -rf gmsh')
+print "Cloning the svn-repo."
+os.system('svn co https://geuz.org/svn/gmsh/trunk gmsh --username gmsh --password gmsh --non-interactive --trust-server-cert')
+
+
+infile = open('gmsh/.svn/entries',"r")
+lines = infile.readlines()
+revID = int(lines[3])
+print "Revision ID is %d" % (revID)
+
+print "Removing svn-files"
+os.system('find . -name ".svn" -exec rm -rf {} \;')
+
+print "Making dfsg-compatible"
+os.system('rm -f gmsh/contrib/Metis/*.c;\
+ rm -f gmsh/contrib/Metis/*.h;\
+ rm -f gmsh/contrib/Tetgen1.4/*.cxx; \
+ rm -f gmsh/contrib/Tetgen1.4/*.h; \
+ rm -f gmsh/contrib/Tetgen1.4/LICENSE; \
+ rm -f gmsh/contrib/Tetgen1.5/*.cxx; \
+ rm -f gmsh/contrib/Tetgen1.5/*.h; \
+ rm -f gmsh/contrib/Tetgen1.5/*.poly\
+ rm -f gmsh/contrib/Tetgen1.5/makefile\
+ rm -f gmsh/contrib/Tetgen1.5/LICENSE;')
+
+folderName = 'gmsh-2.5.1~beta2~svn%s~dfsg' % (revID)
+fileName = 'gmsh_2.5.1~beta2~svn%s~dfsg.orig.tar.xz' % (revID)
+#renaming the folder
+os.system('mv gmsh %s' % (folderName))
+#packing
+print "Creating a tarball."
+os.system('apack %s %s' % (fileName, folderName))
+#Removing folder
+os.system(('rm -rf %s')% (folderName))
Propchange: packages/gmsh-tetgen/trunk/debian/scripts/get_orig.py
------------------------------------------------------------------------------
svn:executable = *
Added: packages/gmsh-tetgen/trunk/debian/source/format
URL: http://svn.debian.org/wsvn/debian-science/packages/gmsh-tetgen/trunk/debian/source/format?rev=44743&op=file
==============================================================================
--- packages/gmsh-tetgen/trunk/debian/source/format (added)
+++ packages/gmsh-tetgen/trunk/debian/source/format Fri Apr 27 07:09:04 2012
@@ -1,0 +1,1 @@
+3.0 (quilt)
Added: packages/gmsh-tetgen/trunk/debian/watch
URL: http://svn.debian.org/wsvn/debian-science/packages/gmsh-tetgen/trunk/debian/watch?rev=44743&op=file
==============================================================================
--- packages/gmsh-tetgen/trunk/debian/watch (added)
+++ packages/gmsh-tetgen/trunk/debian/watch Fri Apr 27 07:09:04 2012
@@ -1,0 +1,3 @@
+version=3
+opts=dversionmangle=s/\.dfsg// \
+http://www.geuz.org/gmsh/src/gmsh-([\d.]+)-source\.tgz
More information about the debian-science-commits
mailing list