Update pre-requisites for v9.6

diff --git a/config/build_options/occ/options_compilation_salome_master.txt b/config/build_options/occ/options_compilation_salome_master.txt
index d07dd59b18d72be23f33d146db4561ca9586f1c3..2fb8ff837366eb91b03a69a9232fb9a4c2c489bd 100644 (file)
--- a/config/build_options/occ/options_compilation_salome_master.txt
+++ b/config/build_options/occ/options_compilation_salome_master.txt
@@ -88,20 +88,20 @@ LIBBATCH
 LIGHT
 > cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=${LIGHT_ROOT_DIR} ${LIGHT_SRC_DIR}
 
-MED
-> cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=${MED_ROOT_DIR} ${MED_SRC_DIR}
+FIELDS
+> cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=${FILEDS_ROOT_DIR} ${FIELDS_SRC_DIR}
 
 MEDCOUPLING
-> cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=${MEDCOUPLING_ROOT_DIR} ${MEDCOUPLING_SRC_DIR}
+> cmake -DCMAKE_BUILD_TYPE=Release -DMEDCOUPLING_USE_64BIT_IDS=ON -DCMAKE_INSTALL_PREFIX=${MEDCOUPLING_ROOT_DIR} ${MEDCOUPLING_SRC_DIR}
 
 MEDCOUPLING_OPT
-> cmake -DCMAKE_BUILD_TYPE=Release -DSALOME_USE_MPI=ON -DSALOME_MED_PARTITIONER_PARMETIS=OFF -DCMAKE_INSTALL_PREFIX=${MEDCOUPLING_OPT_ROOT_DIR} ${MEDCOUPLING_SRC_DIR}
+> cmake -DCMAKE_BUILD_TYPE=Release -DMEDCOUPLING_USE_64BIT_IDS=ON -DSALOME_USE_MPI=ON -DSALOME_MED_PARTITIONER_PARMETIS=OFF -DCMAKE_INSTALL_PREFIX=${MEDCOUPLING_OPT_ROOT_DIR} ${MEDCOUPLING_SRC_DIR}
 
 MEDCOUPLINGMICRO
-> cmake -DCMAKE_BUILD_TYPE=Release -DMEDCOUPLING_MICROMED=ON -DCMAKE_INSTALL_PREFIX=${MEDCOUPLINGMICRO_ROOT_DIR} ${MEDCOUPLIN_SRC_DIR}
+> cmake -DCMAKE_BUILD_TYPE=Release -DMEDCOUPLING_USE_64BIT_IDS=ON -DMEDCOUPLING_MICROMED=ON -DCMAKE_INSTALL_PREFIX=${MEDCOUPLINGMICRO_ROOT_DIR} ${MEDCOUPLIN_SRC_DIR}
 
-MEDWOGUI
-> cmake -DCMAKE_BUILD_TYPE=Release -DSALOME_BUILD_GUI=OFF -DCMAKE_INSTALL_PREFIX=${MEDWOGUI_ROOT_DIR} ${MED_SRC_DIR}
+FIELDSWOGUI
+> cmake -DCMAKE_BUILD_TYPE=Release -DSALOME_BUILD_GUI=OFF -DCMAKE_INSTALL_PREFIX=${FIELDSWOGUI_ROOT_DIR} ${FIELDS_SRC_DIR}
 
 NETGENPLUGIN
 > cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=${NETGENPLUGIN_ROOT_DIR} ${NETGENPLUGIN_SRC_DIR}
@@ -152,7 +152,7 @@ CAS
 > cmake -DINSTALL_DIR:STRING=${CAS_ROOT_DIR} -D3RDPARTY_TCL_DIR:PATH=${TCLTK_ROOT_DIR} -DUSE_TBB:BOOL=ON -D3RDPARTY_TBB_DIR:PATH=${TBB_ROOT_DIR} -D3RDPARTY_FREETYPE_DIR:PATH=${FREETYPE_ROOT_DIR} -DUSE_FREEIMAGE:BOOL=ON -D3RDPARTY_FREEIMAGE_DIR:PATH=${FREEIMAGE_ROOT_DIR} -DCMAKE_BUILD_TYPE:STRING=Release ${CAS_SRC_DIR}
 
 Paraview
-cmake -DCMAKE_INSTALL_PREFIX:STRING=${PARAVIEW_ROOT_DIR} -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON -DCMAKE_BUILD_TYPE:STRING=Release -DCMAKE_CXX_FLAGS:STRING=-m64 -DCMAKE_C_FLAGS:STRING=-m64 -DPARAVIEW_BUILD_SHARED_LIBS:BOOL=ON -DPARAVIEW_BUILD_TESTING:BOOL=OFF -DPARAVIEW_INSTALL_DEVELOPMENT_FILES:BOOL=ON -DOpenGL_GL_PREFERENCE:STRING=LEGACY -DPARAVIEW_ENABLE_RAYTRACING:BOOL=ON -DVTK_ENABLE_OSPRAY:BOOL=ON -Dembree_DIR:PATH=${EMBREE_ROOT_DIR}/lib64/cmake/embree-3.3.0 -DTBB_ROOT:PATH=${TBB_ROOT_DIR} -DVTK_USE_64BIT_IDS:BOOL=OFF -DVTK_REPORT_OPENGL_ERRORS:BOOL=OFF -DVTK_MODULE_ENABLE_VTK_RenderingLOD:INTERNAL=YES -DVTK_MODULE_ENABLE_VTK_FiltersCore:INTERNAL=YES -DVTK_MODULE_ENABLE_VTK_CommonCore:INTERNAL=YES -DVTK_MODULE_ENABLE_VTK_IOCore:INTERNAL=YES -DVTK_MODULE_ENABLE_VTK_IOEnSight:INTERNAL=YES -DVTK_MODULE_ENABLE_VTK_IOInfovis:INTERNAL=YES -DPARAVIEW_USE_QT:BOOL=ON -DVTK_BUILD_QT_DESIGNER_PLUGIN:BOOL=OFF -DPARAVIEW_USE_PYTHON:BOOL=ON -DVTK_WRAP_PYTHON:BOOL=ON -DPython3_INCLUDE_DIR:STRING=${PYTHON_ROOT_DIR}/include/python3.6 -DPython3_LIBRARY:STRING=${PYTHON_ROOT_DIR}/lib/libpython3.6.so -DVTK_PYTHON_FULL_THREADSAFE:BOOL=ON -DVTK_NO_PYTHON_THREADS:BOOL=OFF -DVTK_PYTHON_VERSION:STRING=3 -DVTK_WRAP_JAVA:BOOL=OFF -DPARAVIEW_USE_MPI:BOOL=OFF -DVTK_MODULE_USE_EXTERNAL_VTK_hdf5:BOOL=ON -DHDF5_DIR:PATH=${HDF5_ROOT_DIR}/share/cmake/hdf5 -DHDF5_USE_STATIC_LIBRARIES:BOOL=OFF -DPARAVIEW_ENABLE_VISITBRIDGE:BOOL=ON -DBOOST_ROOT:PATH=${BOOST_ROOT_DIR} -DBoost_NO_BOOST_CMAKE:BOOL=ON -DBoost_NO_SYSTEM_PATHS:BOOL=ON -DVTK_MODULE_USE_EXTERNAL_VTK_gl2ps:BOOL=OFF -DVTK_MODULE_USE_EXTERNAL_VTK_libxml2:BOOL=ON -DLIBXML2_INCLUDE_DIR:STRING=${LIBXML2_ROOT_DIR}/include/libxml2 -DLIBXML2_LIBRARIES:STRING=${LIBXML2_ROOT_DIR}/lib/libxml2.so -DVTK_MODULE_USE_EXTERNAL_VTK_freetype:BOOL=ON -DVTK_MODULE_USE_EXTERNAL_ParaView_cgns:BOOL=ON -DCGNS_INCLUDE_DIR:PATH=${CGNS_ROOT_DIR}/include -DCGNS_LIBRARY:PATH=${CGNS_ROOT_DIR}/lib/libcgns.so -DVTK_MODULE_ENABLE_ParaView_cgns:INTERNAL=YES -DVTK_MODULE_ENABLE_ParaView_VTKExtensionsCGNSReader:INTERNAL=YES -DVTK_MODULE_ENABLE_ParaView_VTKExtensionsCGNSWriter:INTERNAL=YES -DPARAVIEW_PLUGINS_DEFAULT:BOOL=ON -DPARAVIEW_PLUGIN_ENABLE_Moments:BOOL=OFF -DPARAVIEW_PLUGIN_ENABLE_SLACTools:BOOL=OFF -DPARAVIEW_PLUGIN_ENABLE_SierraPlotTools:BOOL=OFF -DPARAVIEW_PLUGIN_ENABLE_PacMan:BOOL=OFF -DPARAVIEW_PLUGIN_ENABLE_pvblot:BOOL=OFF ${PARAVIEW_SRC_DIR}
+cmake -DCMAKE_INSTALL_PREFIX:STRING=${PARAVIEW_ROOT_DIR} -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON -DCMAKE_BUILD_TYPE:STRING=Release -DCMAKE_CXX_FLAGS:STRING=-m64 -DCMAKE_C_FLAGS:STRING=-m64 -DPARAVIEW_BUILD_SHARED_LIBS:BOOL=ON -DPARAVIEW_BUILD_TESTING:BOOL=OFF -DPARAVIEW_INSTALL_DEVELOPMENT_FILES:BOOL=ON -DOpenGL_GL_PREFERENCE:STRING=LEGACY -DPARAVIEW_ENABLE_RAYTRACING:BOOL=ON -DVTK_ENABLE_OSPRAY:BOOL=ON -Dembree_DIR:PATH=${EMBREE_ROOT_DIR}/lib64/cmake/embree-3.3.0 -DTBB_ROOT:PATH=${TBB_ROOT_DIR} -DVTK_USE_64BIT_IDS:BOOL=ON -DVTK_REPORT_OPENGL_ERRORS:BOOL=OFF -DVTK_MODULE_ENABLE_VTK_RenderingLOD:INTERNAL=YES -DVTK_MODULE_ENABLE_VTK_FiltersCore:INTERNAL=YES -DVTK_MODULE_ENABLE_VTK_CommonCore:INTERNAL=YES -DVTK_MODULE_ENABLE_VTK_IOCore:INTERNAL=YES -DVTK_MODULE_ENABLE_VTK_IOEnSight:INTERNAL=YES -DVTK_MODULE_ENABLE_VTK_IOInfovis:INTERNAL=YES -DPARAVIEW_USE_QT:BOOL=ON -DVTK_BUILD_QT_DESIGNER_PLUGIN:BOOL=OFF -DPARAVIEW_USE_PYTHON:BOOL=ON -DVTK_WRAP_PYTHON:BOOL=ON -DPython3_INCLUDE_DIR:STRING=${PYTHON_ROOT_DIR}/include/python3.6 -DPython3_LIBRARY:STRING=${PYTHON_ROOT_DIR}/lib/libpython3.6.so -DVTK_PYTHON_FULL_THREADSAFE:BOOL=ON -DVTK_NO_PYTHON_THREADS:BOOL=OFF -DVTK_PYTHON_VERSION:STRING=3 -DVTK_WRAP_JAVA:BOOL=OFF -DPARAVIEW_USE_MPI:BOOL=OFF -DVTK_MODULE_USE_EXTERNAL_VTK_hdf5:BOOL=ON -DHDF5_DIR:PATH=${HDF5_ROOT_DIR}/share/cmake/hdf5 -DHDF5_USE_STATIC_LIBRARIES:BOOL=OFF -DPARAVIEW_ENABLE_VISITBRIDGE:BOOL=ON -DBOOST_ROOT:PATH=${BOOST_ROOT_DIR} -DBoost_NO_BOOST_CMAKE:BOOL=ON -DBoost_NO_SYSTEM_PATHS:BOOL=ON -DVTK_MODULE_USE_EXTERNAL_VTK_gl2ps:BOOL=OFF -DVTK_MODULE_USE_EXTERNAL_VTK_libxml2:BOOL=ON -DLIBXML2_INCLUDE_DIR:STRING=${LIBXML2_ROOT_DIR}/include/libxml2 -DLIBXML2_LIBRARIES:STRING=${LIBXML2_ROOT_DIR}/lib/libxml2.so -DVTK_MODULE_USE_EXTERNAL_VTK_freetype:BOOL=ON -DVTK_MODULE_USE_EXTERNAL_ParaView_cgns:BOOL=ON -DCGNS_INCLUDE_DIR:PATH=${CGNS_ROOT_DIR}/include -DCGNS_LIBRARY:PATH=${CGNS_ROOT_DIR}/lib/libcgns.so -DVTK_MODULE_ENABLE_ParaView_cgns:INTERNAL=YES -DVTK_MODULE_ENABLE_ParaView_VTKExtensionsCGNSReader:INTERNAL=YES -DVTK_MODULE_ENABLE_ParaView_VTKExtensionsCGNSWriter:INTERNAL=YES -DPARAVIEW_PLUGINS_DEFAULT:BOOL=ON -DPARAVIEW_PLUGIN_ENABLE_Moments:BOOL=OFF -DPARAVIEW_PLUGIN_ENABLE_SLACTools:BOOL=OFF -DPARAVIEW_PLUGIN_ENABLE_SierraPlotTools:BOOL=OFF -DPARAVIEW_PLUGIN_ENABLE_PacMan:BOOL=OFF -DPARAVIEW_PLUGIN_ENABLE_pvblot:BOOL=OFF ${PARAVIEW_SRC_DIR}
 
 Pillow
 > python3 ./setup.py install --prefix=${PILLOW_ROOT_DIR}
@@ -296,8 +296,9 @@ matplotlib and matplotlib related products
  * matplotlib
  > python3 ./setup.py install --prefix=${MATPLOTLIB_ROOT_DIR}
 
-med
-> cmake -DCMAKE_INSTALL_PREFIX:STRING=${MED_ROOT_DIR} -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON -DCMAKE_BUILD_TYPE:STRING=Release -DMEDFILE_BUILD_SHARED_LIBS:BOOL=ON -DMEDFILE_BUILD_TESTS:BOOL=OFF -DMEDFILE_INSTALL_DOC:BOOL=ON -DMEDFILE_BUILD_PYTHON:BOOL=ON -DPYTHON_INCLUDE_DIR:PATH=${PYTHON_ROOT_DIR}/include/python3.6 -DPYTHON_LIBRARY:FILEPATH=${PYTHON_ROOT_DIR}/lib/libpython3.6.so -DHDF5_ROOT:PATH=${HDF5_ROOT_DIR} ${MED_SRC_DIR}
+medfile
+> cmake -DCMAKE_INSTALL_PREFIX:STRING=${MEDFILE_ROOT_DIR} -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON -DCMAKE_BUILD_TYPE:STRING=Release -DMEDFILE_BUILD_SHARED_LIBS:BOOL=ON -DMEDFILE_BUILD_TESTS:BOOL=OFF -DMEDFILE_INSTALL_DOC:BOOL=ON -DMEDFILE_BUILD_PYTHON:BOOL=ON -DPYTHON_INCLUDE_DIR:PATH=${PYTHON_ROOT_DIR}/include/python3.6 -DPYTHON_LIBRARY:FILEPATH=${PYTHON_ROOT_DIR}/lib/libpython3.6.so -DHDF5_ROOT:PATH=${HDF5_ROOT_DIR} -DMED_MEDINT_TYPE=long ${MEDFILE_SRC_DIR}
+(note: build as FFLAGS=-fdefault-integer-8 cmake ${cmake_options})
 
 metis
 > make config prefix=${METIS_ROOT_DIR} shared=1

diff --git a/config/salome.xml b/config/salome.xml
index 7d784e0f33ea810e319a9dd7d73140622d4c6427..b1bed292de2f5c04ffc097199c129c7cac55eccd 100644 (file)
--- a/config/salome.xml
+++ b/config/salome.xml
@@ -51,7 +51,7 @@
     </patches>
   </product>
   <product name="medfile" version="4.1.0" /> 
-  <product name="meshgems" version="2.10.3" />
+  <product name="meshgems" version="2.10.4" />
   <product name="metis" version="5.1.0" />
   <product name="mpich2" version="1.4.1p1" />
   <product name="mpi4py" version="1.3.1" />
@@ -67,7 +67,7 @@
       <patch comment="Fix problem with shell command" name="numpy.001_shell.patch" sha1="d004dfb9053fcc7bcdc021e8c7aa3eb552a80452" />
     </patches>
   </product>
-  <product name="occt" version="7.4.0p1" />
+  <product name="occt" version="7.4.0p2" />
   <product name="omniorb" version="4.2.2" />
   <product name="omniorbpy" version="4.2.2" />
   <product name="opencv" version="3.2.0">