bos #41189 - PyFMI

diff --git a/applications/SALOME-master-windows.pyconf b/applications/SALOME-master-windows.pyconf
index 22e1a6647a348ed1587b9ad12f03bfe0480103e6..13204ab845376081fee7af47b4ee1f7bb5fc00a9 100644 (file)
--- a/applications/SALOME-master-windows.pyconf
+++ b/applications/SALOME-master-windows.pyconf
@@ -245,6 +245,7 @@ __overwrite__ :
     'APPLICATION.products.ParaView'   : {tag: '5.11.0',  base: 'no', section : 'version_5_11_0_win_dbg'     }
     'APPLICATION.products.zlib'       : {tag: '1.2.5',   base: 'no', section : 'version_1_2_5_win_dbg'      }
     'APPLICATION.products.gmsh'       : {tag: '4.10.3',  base: 'no', section : 'version_4_10_3_win_dbg'     }
+    'APPLICATION.products.cmake'      : '3.0.12' # until CMP0078 and - cmake 3.24 fixed shows a serious issue about import which needs to be addressed
   }
   {
     __condition__ : "APPLICATION.debug == 'yes' and APPLICATION.pyver == '3.6'"
@@ -272,5 +273,6 @@ __overwrite__ :
     'APPLICATION.products.ParaView'   : {tag: '5.11.0',  base: 'no', section : 'version_5_11_0_win_dbg'     }
     'APPLICATION.products.zlib'       : {tag: '1.2.5',   base: 'no', section : 'version_1_2_5_win_dbg'      }
     'APPLICATION.products.gmsh'       : {tag: '4.10.3',  base: 'no', section : 'version_4_10_3_win_dbg'     }
+    'APPLICATION.products.cmake'      : '3.0.12' # until CMP0078 and - cmake 3.24 fixed shows a serious issue about import which needs to be addressed
   }
 ]

diff --git a/products/compil_scripts/PyFMI-2.6.bat b/products/compil_scripts/PyFMI-2.6.bat
index 4a786703f0420da491405f47f64acf544c89ca44..2d815fb58a54de2cf5b1584a22d177f0ec9b0839 100644 (file)
--- a/products/compil_scripts/PyFMI-2.6.bat
+++ b/products/compil_scripts/PyFMI-2.6.bat
@@ -18,7 +18,15 @@ mkdir %BUILD_DIR%
 cd %SOURCE_DIR%
 xcopy * %BUILD_DIR%\ /E /I /Q
 cd %BUILD_DIR%
-del /Q /S %BUILD_DIR%\src\pyfmi\*.c
+
+if NOT %PYTHON_VERSION% == 3.6 (
+       del /Q /S %BUILD_DIR%\src\pyfmi\*.c
+)
+
+if %PYTHON_VERSION% == 3.6 (
+   COPY /Y %BUILD_DIR%\src\pyfmi\fmi.pyx.3.6.5 %BUILD_DIR%\src\pyfmi\fmi.pyx
+)
+
 set INSTALL_LIB=%PRODUCT_INSTALL%\lib\python%PYTHON_VERSION%\site-packages
 if NOT exist "%INSTALL_LIB%" mkdir %INSTALL_LIB%
 set PYTHONPATH=%INSTALL_LIB%;%PYTHONPATH%