[SCM] Gmsh packaging. Gmsh is an automatic 3D finite element mesh generator. branch, master, updated. upstream/2.5.1_beta2_svn11122_dfsg-119-g925ed99

[Anton Gladky]

The following commit has been merged in the master branch:
commit fe2db58729a2093edb521e00e819a8d650f04c60
Author: Anton Gladky <gladky.anton at gmail.com>
Date:   Fri Feb 10 20:25:12 2012 +0100

    Switch from opencascade to oce.

diff --git a/debian/control b/debian/control
index 047f091..6c84e4d 100644
--- a/debian/control
+++ b/debian/control
@@ -10,7 +10,7 @@ Build-Depends: debhelper (>= 8), cmake, gfortran, libgl1-mesa-dev,
  libpng12-dev, libjpeg-dev, zlib1g-dev, texlive, texinfo,
  mpi-default-dev,
  libgmm++-dev [!hurd-i386 !s390x],
- libopencascade-modeling-dev,
+ liboce-modeling-dev,
  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],
diff --git a/debian/patches/series b/debian/patches/series
index 8712b22..25a5633 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,3 +6,4 @@ use_tetgen.patch
 use_mmg3d.patch
 use_gmm.patch
 use_libann.patch
+switch_from_opencascade_to_oce.patch
diff --git a/debian/patches/switch_from_opencascade_to_oce.patch b/debian/patches/switch_from_opencascade_to_oce.patch
new file mode 100644
index 0000000..fec1929
--- /dev/null
+++ b/debian/patches/switch_from_opencascade_to_oce.patch
@@ -0,0 +1,63 @@
+Desctiption: 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
+@@ -764,15 +764,6 @@
+ 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
+@@ -783,6 +774,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})
+@@ -819,6 +834,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)

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