Porting to OCCT 7.8.0 on Windows

diff --git a/products/gmsh.pyconf b/products/gmsh.pyconf
index 9614ac73e18e6a809002ce5b198fbde2eb72f7b1..fc2aac7eaf02d7ace76ebab76c5150b2d04386e7 100644 (file)
--- a/products/gmsh.pyconf
+++ b/products/gmsh.pyconf
@@ -39,6 +39,14 @@ version_4_10_3_with_CAS_7_8:
   patches : ['gmsh-4.10.3-occt780.patch']
 }
 
+version_4_10_3_with_CAS_7_8_win:
+{
+  archive_info : {archive_name : "gmsh-4.10.3.tar.gz"}
+  compil_script : "gmsh-4.10.3.sh"
+  depend : ["CAS","lapack","hdf5","medfile", "cgns"]
+  patches : ['gmsh-4.10.3-occt780-win.patch']
+}
+
 version_4_10_3:
 {
   compil_script : "gmsh-4.10.3.sh"

diff --git a/products/netgen.pyconf b/products/netgen.pyconf
index 7d567ac26a27c97b7936290a681b4f4999385e6a..da1c679abc7dd8a63c1783bbb8eeac347553ec78 100644 (file)
--- a/products/netgen.pyconf
+++ b/products/netgen.pyconf
@@ -61,6 +61,7 @@ version_5_3_1_with_CAS_7_8 :
 
 version_5_3_1_with_CAS_7_8_win :
 {
+   archive_info : {archive_name : "netgen-5.3.1.tar.gz"}
    compil_script :  'netgen.bat'
    patches :  ['netgen53ForSalomeOCCT730.patch','netgen53ForWindows.patch','netgen53ForSalomeVisualStudio2017.patch','netgen5.3_withOCCT780_win.patch']
    properties :

diff --git a/products/patches/gmsh-4.10.3-occt780-win.patch b/products/patches/gmsh-4.10.3-occt780-win.patch
new file mode 100644 (file)
index 0000000..ea95587
--- /dev/null
+++ b/products/patches/gmsh-4.10.3-occt780-win.patch
@@ -0,0 +1,22 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 8f99dfe..8955a1f 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -1264,7 +1264,7 @@ if(ENABLE_OCC)
+   elseif(OCC_INC)
+     set(OCC_LIBS_REQUIRED
+       # subset of DataExchange
+-              TKSTEP TKSTEP209 TKSTEPAttr TKSTEPBase TKIGES TKXSBase
++              TKDESTEP TKDEIGES TKXSBase
+               # ModelingAlgorithms
+               TKOffset TKFeat TKFillet TKBool TKMesh TKHLR TKBO TKPrim TKShHealing
+               TKTopAlgo TKGeomAlgo
+@@ -1304,7 +1304,7 @@ if(ENABLE_OCC)
+     find_package(Freetype)
+     if(FREETYPE_FOUND)
+       set(OCC_CAF_LIBS_REQUIRED
+-          TKXDESTEP TKXDEIGES TKXCAF TKLCAF TKVCAF TKCAF TKV3d TKService TKCDF)
++          TKXCAF TKLCAF TKVCAF TKCAF TKV3d TKService TKCDF)
+       list(LENGTH OCC_CAF_LIBS_REQUIRED NUM_OCC_CAF_LIBS_REQUIRED)
+       set(OCC_CAF_LIBS)
+       foreach(OCC ${OCC_CAF_LIBS_REQUIRED})