From: rnv <rnv@opencascade.com>
Date: Fri, 8 Oct 2021 08:50:58 +0000 (+0300)
Subject: Build NETGENPLUGIN under Windows platform with Netgen-6
X-Git-Tag: V9_8_0a2
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=992f61fe9a857e160e27562fc07f243a59143ae2;p=plugins%2Fnetgenplugin.git

Build NETGENPLUGIN under Windows platform with Netgen-6
---

diff --git a/src/NETGENPlugin/CMakeLists.txt b/src/NETGENPlugin/CMakeLists.txt
index fc59406..c882e14 100644
--- a/src/NETGENPlugin/CMakeLists.txt
+++ b/src/NETGENPlugin/CMakeLists.txt
@@ -30,6 +30,7 @@ INCLUDE_DIRECTORIES(
   ${Boost_INCLUDE_DIRS}
   ${OMNIORB_INCLUDE_DIR}
   ${PROJECT_BINARY_DIR}/idl
+  ${NETGEN_ZLIB_INCLUDE_DIRS}
 )
 
 # additional preprocessor / compiler flags
diff --git a/src/NETGENPlugin/NETGENPlugin_Defs.hxx b/src/NETGENPlugin/NETGENPlugin_Defs.hxx
index 7ceb67b..734b235 100644
--- a/src/NETGENPlugin/NETGENPlugin_Defs.hxx
+++ b/src/NETGENPlugin/NETGENPlugin_Defs.hxx
@@ -35,7 +35,7 @@
     #define NETGENPLUGIN_EXPORT __declspec( dllimport )
   #endif
 
-  #if defined(NETGEN_V5)
+  #if defined(NETGEN_V5) || defined(NETGEN_V6)
     #define NETGENPLUGIN_DLL_HEADER DLL_HEADER
   #else
     #define NETGENPLUGIN_DLL_HEADER
diff --git a/src/NETGENPlugin/NETGENPlugin_Remesher_2D.cxx b/src/NETGENPlugin/NETGENPlugin_Remesher_2D.cxx
index 5851a77..e35168d 100644
--- a/src/NETGENPlugin/NETGENPlugin_Remesher_2D.cxx
+++ b/src/NETGENPlugin/NETGENPlugin_Remesher_2D.cxx
@@ -66,7 +66,11 @@ namespace netgen {
 namespace nglib
 {
   NETGENPLUGIN_DLL_HEADER
+#ifdef NETGEN_V6
+  extern netgen::NgArray<netgen::Point<3> > readedges;
+#else
   extern netgen::Array<netgen::Point<3> > readedges;
+#endif
 }
 
 namespace