From bc2dc105a56c79559595b1a0c6c496b835cdf31c Mon Sep 17 00:00:00 2001
From: rnv <rnv@opencascade.com>
Date: Wed, 27 Feb 2019 15:28:48 +0300
Subject: [PATCH] Porting to gmsh-4.1.4: beginning

---
 adm_local/cmake_files/FindGMSH.cmake |  4 ++--
 src/GMSHPlugin/GMSHPlugin_Mesher.cxx |  4 ++++
 src/GMSHPlugin/GMSHPlugin_Mesher.hxx | 10 ++++++++++
 3 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/adm_local/cmake_files/FindGMSH.cmake b/adm_local/cmake_files/FindGMSH.cmake
index 54f346e..a4c6842 100644
--- a/adm_local/cmake_files/FindGMSH.cmake
+++ b/adm_local/cmake_files/FindGMSH.cmake
@@ -37,8 +37,8 @@ IF(GMSH_ROOT_DIR)
  LIST(APPEND CMAKE_PREFIX_PATH "${GMSH_ROOT_DIR}")
 ENDIF(GMSH_ROOT_DIR)
 
-FIND_PATH(GMSH_INCLUDE_DIRS Gmsh.h PATH_SUFFIXES gmsh)
-FIND_LIBRARY(GMSH_LIBRARIES NAMES Gmsh)
+FIND_PATH(GMSH_INCLUDE_DIRS Gmsh.h gmsh.h PATH_SUFFIXES gmsh)
+FIND_LIBRARY(GMSH_LIBRARIES NAMES Gmsh gmsh)
 
 INCLUDE(FindPackageHandleStandardArgs)
 FIND_PACKAGE_HANDLE_STANDARD_ARGS(GMSH REQUIRED_VARS GMSH_INCLUDE_DIRS GMSH_LIBRARIES)
diff --git a/src/GMSHPlugin/GMSHPlugin_Mesher.cxx b/src/GMSHPlugin/GMSHPlugin_Mesher.cxx
index 2d71072..4c397d9 100644
--- a/src/GMSHPlugin/GMSHPlugin_Mesher.cxx
+++ b/src/GMSHPlugin/GMSHPlugin_Mesher.cxx
@@ -57,6 +57,10 @@
 #include <TopTools_MapOfShape.hxx>
 #include <TopoDS.hxx>
 
+#if GMSH_MAJOR_VERSION >=4
+#include "GmshGlobal.h"
+#endif
+
 using namespace std;
 
 //=============================================================================
diff --git a/src/GMSHPlugin/GMSHPlugin_Mesher.hxx b/src/GMSHPlugin/GMSHPlugin_Mesher.hxx
index d047d67..c58ef21 100644
--- a/src/GMSHPlugin/GMSHPlugin_Mesher.hxx
+++ b/src/GMSHPlugin/GMSHPlugin_Mesher.hxx
@@ -22,13 +22,23 @@
 #define _GMSHPlugin_Mesher_HXX_
 
 #include <stdio.h>
+#include "GmshVersion.h"
+#if GMSH_MAJOR_VERSION >=4 
+#include "gmsh.h"
+#else 
 #include "Gmsh.h"
+#endif
 #include "GmshConfig.h"
 #include "GModelIO_OCC.h"
 #include "GModelIO_GEO.h"
 #include "Geo.h"
+#if GMSH_MAJOR_VERSION >=4
+#include "GEdge.h" 
+#include "GFace.h"
+#else
 #include "GEdgeCompound.h"
 #include "GFaceCompound.h"
+#endif
 #include "MElement.h"
 
 #include "GMSHPlugin_Defs.hxx"
-- 
2.39.2