r46514 - /packages/gmsh-tetgen/trunk/debian/patches/netgen.patch

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

Author: trophime-guest
Date: Tue Feb 11 15:16:42 2014
New Revision: 46514

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=46514
Log:
fix for system netgen 5.1

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

Modified: packages/gmsh-tetgen/trunk/debian/patches/netgen.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/gmsh-tetgen/trunk/debian/patches/netgen.patch?rev=46514&op=diff
==============================================================================
--- packages/gmsh-tetgen/trunk/debian/patches/netgen.patch	(original)
+++ packages/gmsh-tetgen/trunk/debian/patches/netgen.patch	Tue Feb 11 15:16:42 2014
@@ -1,8 +1,8 @@
 Index: gmsh-tetgen-2.8.4~svn17620/CMakeLists.txt
 ===================================================================
---- gmsh-tetgen-2.8.4~svn17620.orig/CMakeLists.txt	2014-02-11 09:28:50.398969819 +0100
-+++ gmsh-tetgen-2.8.4~svn17620/CMakeLists.txt	2014-02-11 09:30:08.722617801 +0100
-@@ -719,10 +719,31 @@
+--- gmsh-tetgen-2.8.4~svn17620.orig/CMakeLists.txt	2014-02-11 16:03:36.376008782 +0100
++++ gmsh-tetgen-2.8.4~svn17620/CMakeLists.txt	2014-02-11 16:06:47.672781421 +0100
+@@ -719,10 +719,36 @@
    endif(ENABLE_BLOSSOM)
  
    if(ENABLE_NETGEN)
@@ -11,6 +11,11 @@
 +    if(NGLIB_LIB AND NGLIB_INC)
 +       list(APPEND EXTERNAL_LIBRARIES ${NGLIB_LIB})
 +       list(APPEND EXTERNAL_INCLUDES ${NGLIB_INC})
++       message(STATUS "Using System NGLIB")
++       FIND_LIBRARY( OCC_NGLIB_LIB occ PATH_SUFFIXES lib)
++       if(OCC_NGLIB_LIB)
++	  list(APPEND EXTERNAL_LIBRARIES ${OCC_NGLIB_LIB})
++       endif(OCC_NGLIB_LIB)
 +    else(NGLIB_LIB AND NGLIB_INC)
 +       message(STATUS "System NGLIB not found: using contrib/Negen/nglib instead")
 +    endif(NGLIB_LIB AND NGLIB_INC)
@@ -36,7 +41,7 @@
      add_definitions(-DNO_PARALLEL_THREADS -DNOTCL)
    endif(ENABLE_NETGEN)
  
-@@ -1061,8 +1082,13 @@
+@@ -1061,8 +1087,13 @@
        add_definitions(-DSGEOMGEOMETRY)
        set_config_option(HAVE_SGEOM "SGEOM")
      elseif(ENABLE_SALOME)
@@ -54,8 +59,8 @@
      endif(ENABLE_SGEOM)
 Index: gmsh-tetgen-2.8.4~svn17620/contrib/Netgen/CMakeLists.txt
 ===================================================================
---- gmsh-tetgen-2.8.4~svn17620.orig/contrib/Netgen/CMakeLists.txt	2014-02-11 09:28:50.398969819 +0100
-+++ gmsh-tetgen-2.8.4~svn17620/contrib/Netgen/CMakeLists.txt	2014-02-11 09:28:50.398969819 +0100
+--- gmsh-tetgen-2.8.4~svn17620.orig/contrib/Netgen/CMakeLists.txt	2014-02-11 16:03:36.376008782 +0100
++++ gmsh-tetgen-2.8.4~svn17620/contrib/Netgen/CMakeLists.txt	2014-02-11 16:03:36.376008782 +0100
 @@ -3,38 +3,42 @@
  # See the LICENSE.txt file for license information. Please report all
  # bugs and problems to the public mailing list <gmsh at geuz.org>.