From 6e2990ce6dd0ff82f0021c106245bbd72ad09bc4 Mon Sep 17 00:00:00 2001
From: Stian Skjelstad <stian.skjelstad@gmail.com>
Date: Mon, 21 Jan 2019 12:40:03 +0100
Subject: [PATCH] Netgen provided cmake file, has the include directories to
 use in plural.

Netgen provided cmake file, and the internal detection, had different casing
for the _FOUND variable

When detecting the Netgen include-directories, we only want the /include in
addition to the global one. To include a given header file, specify which
part of the library, or use the one from the project/include directory.
---
 cMake/FindNETGEN.cmake                        | 21 +++++--------------
 .../NETGENPlugin_NETGEN_2D_ONLY.cpp           |  2 +-
 2 files changed, 6 insertions(+), 17 deletions(-)

diff --git a/cMake/FindNETGEN.cmake b/cMake/FindNETGEN.cmake
index 316095f5be..f4d4206cfe 100644
--- a/cMake/FindNETGEN.cmake
+++ b/cMake/FindNETGEN.cmake
@@ -15,12 +15,12 @@
 
 find_package(Netgen CONFIG)
 if(Netgen_FOUND)
-  set(NGLIB_INCLUDE_DIR ${NETGEN_INCLUDE_DIR})
+  set(NGLIB_INCLUDE_DIR ${NETGEN_INCLUDE_DIRS})
   set(NGLIB_LIBRARIES nglib)
   set(NETGEN_DEFINITIONS -DNO_PARALLEL_THREADS -DOCCGEOMETRY)
   # for external smesh only the following two variables are needed:
   set(NETGEN_FOUND True)
-  set(NETGEN_INCLUDE_DIRS ${NETGEN_INCLUDE_DIR})
+  set(NETGEN_INCLUDE_DIRS ${NETGEN_INCLUDE_DIRS})
 
 else(Netgen_FOUND)
 
@@ -104,15 +104,7 @@ else(Netgen_FOUND)
 
   ENDIF(DEFINED MACPORTS_PREFIX OR DEFINED HOMEBREW_PREFIX)
 
-  FIND_PATH(NETGEN_DIR_include NAMES mydefs.hpp     PATHS ${NETGEN_INCLUDEDIR} ${NGLIB_INCLUDE_DIR} ${NGLIB_INCLUDE_DIR}/include ${NETGENDATA}/include)
-  FIND_PATH(NETGEN_DIR_csg     NAMES csg.hpp        PATHS ${NETGEN_INCLUDEDIR} ${NGLIB_INCLUDE_DIR} ${NGLIB_INCLUDE_DIR}/csg     ${NETGENDATA}/csg)
-  FIND_PATH(NETGEN_DIR_gen     NAMES array.hpp      PATHS ${NETGEN_INCLUDEDIR} ${NGLIB_INCLUDE_DIR} ${NGLIB_INCLUDE_DIR}/general ${NETGENDATA}/general)
-  FIND_PATH(NETGEN_DIR_geom2d  NAMES geom2dmesh.hpp PATHS ${NETGEN_INCLUDEDIR} ${NGLIB_INCLUDE_DIR} ${NGLIB_INCLUDE_DIR}/geom2d  ${NETGENDATA}/geom2d)
-  FIND_PATH(NETGEN_DIR_gprim   NAMES gprim.hpp      PATHS ${NETGEN_INCLUDEDIR} ${NGLIB_INCLUDE_DIR} ${NGLIB_INCLUDE_DIR}/gprim   ${NETGENDATA}/gprim)
-  FIND_PATH(NETGEN_DIR_la      NAMES linalg.hpp     PATHS ${NETGEN_INCLUDEDIR} ${NGLIB_INCLUDE_DIR} ${NGLIB_INCLUDE_DIR}/linalg  ${NETGENDATA}/linalg)
-  FIND_PATH(NETGEN_DIR_mesh    NAMES meshing.hpp    PATHS ${NETGEN_INCLUDEDIR} ${NGLIB_INCLUDE_DIR} ${NGLIB_INCLUDE_DIR}/meshing ${NETGENDATA}/meshing)
-  FIND_PATH(NETGEN_DIR_occ     NAMES occgeom.hpp    PATHS ${NETGEN_INCLUDEDIR} ${NGLIB_INCLUDE_DIR} ${NGLIB_INCLUDE_DIR}/occ     ${NETGENDATA}/occ)
-  FIND_PATH(NETGEN_DIR_stlgeom NAMES stlgeom.hpp    PATHS ${NETGEN_INCLUDEDIR} ${NGLIB_INCLUDE_DIR} ${NGLIB_INCLUDE_DIR}/stlgeom ${NETGENDATA}/stlgeom)
+  FIND_PATH(NETGEN_DIR_include NAMES mydefs.hpp     NO_DEFAULT_PATH PATHS ${NGLIB_INCLUDE_DIR}/include ${NETGENDATA}/include ${NETGEN_INCLUDEDIR} ${NGLIB_INCLUDE_DIR})
 
   IF(NOT NGLIB_INCLUDE_DIR AND NOT NETGEN_DIR_include)
       MESSAGE(STATUS "Cannot find NETGEN header files.")
@@ -141,11 +133,8 @@ else(Netgen_FOUND)
   ENDIF()
 
   IF(NGLIB_INCLUDE_DIR AND NGLIB_LIBRARIES)
-      SET(NETGEN_FOUND TRUE)
-      SET(NETGEN_INCLUDE_DIRS ${NETGEN_DIR_include} ${NGLIB_INCLUDE_DIR}
-        ${NETGEN_DIR_csg} ${NETGEN_DIR_gen} ${NETGEN_DIR_geom2d} 
-        ${NETGEN_DIR_gprim} ${NETGEN_DIR_la} ${NETGEN_DIR_mesh}
-        ${NETGEN_DIR_occ} ${NETGEN_DIR_stlgeom})
+      SET(Netgen_FOUND TRUE)
+      SET(NETGEN_INCLUDE_DIRS ${NETGEN_DIR_include} ${NGLIB_INCLUDE_DIR})
       LIST(REMOVE_DUPLICATES NETGEN_INCLUDE_DIRS)
       MATH(EXPR NETGEN_VERSION "(${NETGEN_VERSION_MAJOR} << 16) + (${NETGEN_VERSION_MINOR} << 8)")
       MATH(EXPR NETGEN_VERSION_62 "(6 << 16) + (2 << 8)")
diff --git a/src/3rdParty/salomesmesh/src/NETGENPlugin/NETGENPlugin_NETGEN_2D_ONLY.cpp b/src/3rdParty/salomesmesh/src/NETGENPlugin/NETGENPlugin_NETGEN_2D_ONLY.cpp
index ae2b9377e9..986c19a9b7 100644
--- a/src/3rdParty/salomesmesh/src/NETGENPlugin/NETGENPlugin_NETGEN_2D_ONLY.cpp
+++ b/src/3rdParty/salomesmesh/src/NETGENPlugin/NETGENPlugin_NETGEN_2D_ONLY.cpp
@@ -64,7 +64,7 @@ namespace nglib {
 
 #include <occgeom.hpp>
 #include <meshing.hpp>
-//#include <meshtype.hpp>
+//#include <meshing/meshtype.hpp>
 namespace netgen {
 #if NETGEN_VERSION >= NETGEN_VERSION_STRING(6,2)
   DLL_HEADER extern int OCCGenerateMesh (OCCGeometry&, shared_ptr<Mesh>&, MeshingParameters&);