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

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

Author: trophime-guest
Date: Tue Feb 11 09:10:50 2014
New Revision: 46513

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=46513
Log:
fix using netgen from system

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=46513&op=diff
==============================================================================
--- packages/gmsh-tetgen/trunk/debian/patches/netgen.patch	(original)
+++ packages/gmsh-tetgen/trunk/debian/patches/netgen.patch	Tue Feb 11 09:10:50 2014
@@ -1,7 +1,7 @@
-Index: gmsh-tetgen-2.8.4~svn17615/CMakeLists.txt
+Index: gmsh-tetgen-2.8.4~svn17620/CMakeLists.txt
 ===================================================================
---- gmsh-tetgen-2.8.4~svn17615.orig/CMakeLists.txt	2014-02-10 10:45:35.144550529 +0100
-+++ gmsh-tetgen-2.8.4~svn17615/CMakeLists.txt	2014-02-10 10:45:35.144550529 +0100
+--- 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 @@
    endif(ENABLE_BLOSSOM)
  
@@ -36,29 +36,26 @@
      add_definitions(-DNO_PARALLEL_THREADS -DNOTCL)
    endif(ENABLE_NETGEN)
  
-@@ -1060,12 +1081,17 @@
-       include_directories(contrib/SGEOM)
+@@ -1061,8 +1082,13 @@
        add_definitions(-DSGEOMGEOMETRY)
        set_config_option(HAVE_SGEOM "SGEOM")
--    elseif(ENABLE_SALOME)
-+    elseif(ENABLE_SALOME AND NOT NGLIB_LIB)
-       add_subdirectory(contrib/Salome)
-       include_directories(contrib/Salome)
+     elseif(ENABLE_SALOME)
+-      add_subdirectory(contrib/Salome)
+-      include_directories(contrib/Salome)
++      if(NGLIB_LIB AND NGLIB_INC)
++	# should check if a specific header exist
++	include_directories(/usr/share/netgen/libsrc/occ)
++      else(NGLIB_LIB AND NGLIB_INC)
++	add_subdirectory(contrib/Salome)
++	include_directories(contrib/Salome)
++      endif(NGLIB_LIB AND NGLIB_INC)
        add_definitions(-DOCCGEOMETRY)
        set_config_option(HAVE_SALOME "Salome")
      endif(ENABLE_SGEOM)
-+    if(NGLIB_LIB AND NGLIB_INC)
-+      # should check if a specific header exist
-+      include_directories(/usr/share/netgen/libsrc/occ)
-+      set_config_option(HAVE_SALOME "Salome")
-+    endif(NGLIB_LIB AND NGLIB_INC)
-   endif(HAVE_OCC)
- endif(ENABLE_OCC)
- 
-Index: gmsh-tetgen-2.8.4~svn17615/contrib/Netgen/CMakeLists.txt
+Index: gmsh-tetgen-2.8.4~svn17620/contrib/Netgen/CMakeLists.txt
 ===================================================================
---- gmsh-tetgen-2.8.4~svn17615.orig/contrib/Netgen/CMakeLists.txt	2014-02-10 10:45:35.144550529 +0100
-+++ gmsh-tetgen-2.8.4~svn17615/contrib/Netgen/CMakeLists.txt	2014-02-10 10:45:35.144550529 +0100
+--- 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
 @@ -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>.