r46511 - in /packages/gmsh-tetgen/trunk/debian/patches: series tetgen.patch

[trophime-guest at users.alioth.debian.org]

Author: trophime-guest
Date: Mon Feb 10 11:06:41 2014
New Revision: 46511

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=46511
Log:
add missing patch

Added:
    packages/gmsh-tetgen/trunk/debian/patches/tetgen.patch
Modified:
    packages/gmsh-tetgen/trunk/debian/patches/series

Modified: packages/gmsh-tetgen/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/debian-science/packages/gmsh-tetgen/trunk/debian/patches/series?rev=46511&op=diff
==============================================================================
--- packages/gmsh-tetgen/trunk/debian/patches/series	(original)
+++ packages/gmsh-tetgen/trunk/debian/patches/series	Mon Feb 10 11:06:41 2014
@@ -16,4 +16,5 @@
 #fix_install.patch
 #wrapper_java.patch
 netgen.patch
+tetgen.patch
 #doc.patch

Added: packages/gmsh-tetgen/trunk/debian/patches/tetgen.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/gmsh-tetgen/trunk/debian/patches/tetgen.patch?rev=46511&op=file
==============================================================================
--- packages/gmsh-tetgen/trunk/debian/patches/tetgen.patch	(added)
+++ packages/gmsh-tetgen/trunk/debian/patches/tetgen.patch	Mon Feb 10 11:06:41 2014
@@ -0,0 +1,50 @@
+Index: gmsh-tetgen-2.8.4~svn17615/CMakeLists.txt
+===================================================================
+--- gmsh-tetgen-2.8.4~svn17615.orig/CMakeLists.txt	2014-02-10 11:55:48.434353836 +0100
++++ gmsh-tetgen-2.8.4~svn17615/CMakeLists.txt	2014-02-10 11:59:34.676945519 +0100
+@@ -767,29 +767,30 @@
+     set_config_option(HAVE_MMG3D "Mmg3d")
+   endif(ENABLE_MMG3D)
+ 
+-  if(ENABLE_TETGEN AND EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/contrib/Tetgen1.5/tetgen.h)
+-    add_subdirectory(contrib/Tetgen1.5)
+-    include_directories(contrib/Tetgen1.5)
+-    set_config_option(HAVE_TETGEN "Tetgen(1.5)")
+-    add_definitions(-DTETLIBRARY)
+-  elseif(ENABLE_TETGEN_OLD AND EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/contrib/Tetgen1.4/tetgen.h)
+-    add_subdirectory(contrib/Tetgen1.4)
+-    include_directories(contrib/Tetgen1.4)
+-    set_config_option(HAVE_TETGEN "Tetgen(1.4)")
+-    add_definitions(-DTETLIBRARY)
+-  elseif(ENABLE_TETGEN)
++  if(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")
++      message(STATUS "Using system Tetgen")
++    elseif(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/contrib/Tetgen1.5/tetgen.h)
++      add_subdirectory(contrib/Tetgen1.5)
++      include_directories(contrib/Tetgen1.5)
++      message(STATUS "Using contrib/Tetgen1.5")
+     endif(TETGEN_LIB AND TETGEN_INC)
+-  endif(ENABLE_TETGEN AND EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/contrib/Tetgen1.5/tetgen.h)
+-  if(HAVE_TETGEN)
++    set_config_option(HAVE_TETGEN "Tetgen(1.5)")
++    add_definitions(-DTETLIBRARY)
++  elseif(ENABLE_TETGEN_OLD AND EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/contrib/Tetgen1.4/tetgen.h)
++    add_subdirectory(contrib/Tetgen1.4)
++    include_directories(contrib/Tetgen1.4)
++    set_config_option(HAVE_TETGEN "Tetgen(1.4)")
++    add_definitions(-DTETLIBRARY)
++
+     message(STATUS "Note: By including Tetgen you have to comply with Tetgen's "
+-            "special licensing requirements stated in contrib/Tetgen*/LICENSE.")
+-  endif(HAVE_TETGEN)
++            "special licensing requirements stated in contrib/Tetgen1.4/LICENSE.")
++  endif(ENABLE_TETGEN)
+ endif(HAVE_MESH)
+ 
+ if(ENABLE_FOURIER_MODEL)