CONFIGURATION_ROOT_DIR : $workdir + $VARS.sep + "SOURCES" + $VARS.sep + "CONFIGURATION"
RESTRICTED_ROOT_DIR : $workdir + $VARS.sep + "SOURCES" + $VARS.sep + "RESTRICTED"
SALOME_USE_64BIT_IDS : '1'
++ VTK_SMP_IMPLEMENTATION_TYPE : sequential # OpenMP # choose among: sequential / OpenMP / TBB switches
}
-- launch : {PYTHONIOENCODING:"UTF_8"} # alternative is to encode every accentued string with .encode('utf-8')
++ launch : {PYTHONIOENCODING:"UTF_8", SALOME_MODULES_ORDER:"SHAPER:SHAPERSTUDY:GEOM:SMESH"}
SALOME_trace : "local" # local/file:.../with_logger
SALOME_MODULES : "SHAPER,SHAPERSTUDY,GEOM,SMESH,PARAVIS,YACS,JOBMANAGER" # specify the first modules to display in gui
}
alabaster : 'native'
Babel : 'native'
boost : 'native'
- CAS : 'V7_5_0'
- CAS : 'CR740-SALOME-PATCH'
++ CAS : {tag: 'CR750-SALOME-PATCH', section: 'version_V7_5_0'}
certifi : 'native'
- cgns : 'native'
+ # Standalone native cgns works well. Unfortunately, it's directly linked to native hdf which uses a higher version than us.
+ # Rollback to embedded version to avoid versions mismatch between both of them (see imp_1538_cgns_export_import.py)
- cgns : '3.3.1'
++ cgns : '4.1.1'
chardet : 'native'
click : 'native'
cmake : 'native'
docutils : 'native'
doxygen : 'native'
eigen : 'native'
-- embree : '3.3.0'
++ embree : '3.12.2'
freeimage : 'native'
freetype : 'native'
gl2ps : 'native'
idna : 'native'
imagesize : 'native'
# 'native' not exists (only available on Fedora platform)
-- ispc : '1.9.2'
++ ispc : '1.15.0'
Jinja2 : 'native'
kiwisolver : 'native'
lapack : 'native'
netgen : '5.3.1_with_CAS_7.2'
nlopt : '2.4.2'
numpy : 'native'
- omniORB : '4.2.2'
- omniORBpy : '4.2.2'
+ omniORB : '4.2.3'
+ omniORBpy : '4.2.3'
opencv : 'native'
-- ospray : '1.8.4'
++ openVKL : '0.11.0'
++ ospray : '2.4.0'
packaging : 'native'
-- ParaView : '5.8.0'
++ ParaView : '5.9.0'
petsc : '3.14.0'
Pillow : 'native'
# 'native' not exists : freeCAD part but not delivered with it from package handler
qt : 'native'
qwt : 'native'
requests : 'native'
++ rkCommon : '1.5.1'
scipy : 'native'
scotch : 'native'
setuptools : 'native'
six : 'native'
snowballstemmer : 'native'
Sphinx : 'native'
- sphinxcontrib_napoleon : 'native'
sphinxcontrib_websupport : 'native'
-- sphinxintl: 'native'
sphinx_rtd_theme : 'native'
++ sphinxintl: 'native'
swig : 'native'
tbb : 'native'
tcl : 'native'
'PARAVIS'
'JOBMANAGER'
'YACS'
-- 'SOLVERLAB'
'YACSGEN'
++ 'SOLVERLAB'
'DOCUMENTATION'
'SAMPLES'
'COMPONENT'
single_install_dir : "yes"
}
}
-#__overwrite__ :
-#[
-# {
-# # Overwrite dedicated to older distributions for a further native use
-# # (Some system packages are missing for now on CentOS 8)
-# __condition__ : "VARS.dist in ['FD32', 'DB10']"
-# 'APPLICATION.products.omniORB' : 'native'
-# 'APPLICATION.products.omniORBpy' : 'native'
-# }
-#]
+__overwrite__ :
+[
+ {
- # FD32 is the first to use native opencv4 version (4.2.0) : FindOpenCV.cmake fails (GEOM)
- # Associated library path is found through cv.h header which has been removed
- # (cf. release note of 2.2 version : use imgproc/imgproc.hpp instead - actually included too)
++ # ParaView 5.9 CMake procedure requires Qt 5.12 as minimum version.
++ # Unfortunately, DB10 native one is 5.11. Let's force it as the new minimum one, as it should
++ # be compliant too (add it everywhere to avoid duplicate overwrites).
++ 'PRODUCTS.ParaView.version_5_9_0.patches' : ['paraview.0003-ParaViewClient.patch',
++ 'paraview-0012-LATA_64BITS_IDS.patch',
++ 'paraview-5.9_qt-minimum-version.patch']
++ 'PRODUCTS.PARAVISADDONS.default.patches' : ['paraview-5.9_PARAVISADDONS.patch']
++ }
++ {
++ # Although recent adaptations of GEOM CMake procedure to be compliant with openCV 4.X, some
++ # deeper investigations need to be done in its sources. Use embedded openCV product where
++ # native one is 4.X.
+ __condition__ : "VARS.dist in ['FD32', 'UB20.04']"
+ 'APPLICATION.products.opencv' : '3.2.0'
+ }
+ {
+ # At least on DB10 (UB20 uses the same path...), ParaView fails to find xmlpatterns executable
+ # ParaViewClient.cmake try to find it from Qt5_DIR, going back from it in filesystem (hardcoded).
+ # The standard patch is also needed to be able to build PARAVIS (same kind of issue).
+ __condition__ : "VARS.dist in ['DB10', 'UB20.04']"
+ 'PRODUCTS.ParaView.version_5_8_0.patches' : ['paraview.0003-ParaViewClient.patch',
+ 'paraview.0003-ParaViewClient_native.patch']
+ }
+ {
+ # CentOS 8 repositories don't include sphinxintl package which must be installed through pip.
+ # To avoid its missing (system_info pyconf key doesn't handle this use case), we embed it.
+ __condition__ : "VARS.dist in ['CO8']"
+ 'APPLICATION.products.sphinxintl' : '0.9.10'
+ 'PRODUCTS.sphinxintl.default.properties.pip' : "no"
+ }
+]
-
alabaster : '0.7.6'
Babel : '2.7.0'
boost : '1.67.0'
-- CAS : {section: 'version_V7_5_0_win', tag: 'V7_5_0'}
++ CAS : {tag: 'CR750-SALOME-PATCH', section: 'version_V7_5_0_win'}
certifi : '2019.6.16'
- cgns : '3.3.1'
+ cgns : '4.1.1'
chardet : '3.0.4'
click : '7.0'
cmake : '3.12.1'
alabaster : '0.7.6'
Babel : '2.7.0'
boost : '1.58.0'
-- CAS : 'V7_5_0'
++ CAS : {tag: 'CR750-SALOME-PATCH', section: 'version_V7_5_0'}
certifi : '2018.8.24'
cgns : '4.1.1'
chardet : '3.0.4'
name : "CAS"
build_source : "cmake"
cmake_options : "-DUSE_TCL=OFF -DBUILD_MODULE_Draw=OFF -DUSE_FREETYPE=ON -D3RDPARTY_FREETYPE_DIR=$FREETYPEDIR -DUSE_GL2PS=OFF -DUSE_FREEIMAGE=ON -D3RDPARTY_FREEIMAGE_DIR=$FREEIMAGEDIR"
-- #get_source : "git"
-- get_source : "archive"
++ get_source : "git"
git_info:
{
repo : "http://git.dev.opencascade.org/repos/occt.git"
CSF_OCCTBinPath : $install_dir + $VARS.sep + "win64" + $VARS.sep + "vc14" + $VARS.sep + "bin"
CSF_OCCTLibPath : $install_dir + $VARS.sep + "win64" + $VARS.sep + "vc14" + $VARS.sep + "lib"
CSF_OCCTIncludePath : $install_dir + $VARS.sep + "inc"
-- CSF_OCCTResourcePath : $install_dir + $VARS.sep + "src"
-- CSF_OCCTDataPath : $install_dir + $VARS.sep + "data"
-- CSF_OCCTSamplesPath : $install_dir + $VARS.sep + "samples"
-- CSF_OCCTTestsPath : $install_dir + $VARS.sep + "tests"
-- CSF_OCCTDocPath : $install_dir + $VARS.sep + "doc"
-- CSF_SHMessage : $install_dir + $VARS.sep + "src" + $VARS.sep + "SHMessage"
-- CSF_MDTVTexturesDirectory: $install_dir + $VARS.sep + "src" + $VARS.sep + "Textures"
-- CSF_ShadersDirectory : $install_dir + $VARS.sep + "src" + $VARS.sep + "Shaders"
-- CSF_XSMessage : $install_dir + $VARS.sep + "src" + $VARS.sep + "XSMessage"
-- CSF_TObjMessage : $install_dir + $VARS.sep + "src" + $VARS.sep + "TObj"
-- CSF_StandardDefaults : $install_dir + $VARS.sep + "src" + $VARS.sep + "StdResource"
-- CSF_PluginDefaults : $install_dir + $VARS.sep + "src" + $VARS.sep + "StdResource"
-- CSF_XCAFDefaults : $install_dir + $VARS.sep + "src" + $VARS.sep + "StdResource"
-- CSF_TObjDefaults : $install_dir + $VARS.sep + "src" + $VARS.sep + "StdResource"
-- CSF_StandardLiteDefaults : $install_dir + $VARS.sep + "src" + $VARS.sep + "StdResource"
-- CSF_IGESDefaults : $install_dir + $VARS.sep + "src" + $VARS.sep + "XSTEPResource"
-- CSF_STEPDefaults : $install_dir + $VARS.sep + "src" + $VARS.sep + "XSTEPResource"
-- CSF_XmlOcafResource : $install_dir + $VARS.sep + "src" + $VARS.sep + "XmlOcafResource"
-- CSF_MIGRATION_TYPES : $install_dir + $VARS.sep + "src" + $VARS.sep + "StdResource" + $VARS.sep + "MigrationSheet.txt"
-- CSF_UnitsDefinition : $install_dir + $VARS.sep + "src" + $VARS.sep + "UnitsAPI" + $VARS.sep + "Units.dat"
-- MMGT_CLEAR : "1"
-- MMGT_REENTRANT : "1"
-- CSF_LANGUAGE : "us"
--
-- env_script : "CAS.py"
-- }
-- depend : ['freetype', 'freeimage', 'tbb']
-- build_depend : ["cmake", "doxygen"]
-- source_dir : $APPLICATION.workdir + $VARS.sep + 'SOURCES' + $VARS.sep + $name
-- build_dir : $APPLICATION.workdir + $VARS.sep + 'BUILD' + $VARS.sep + $name
-- properties:
-- {
-- incremental : "no"
-- }
--}
--
--version_CR740_SALOME_PATCH :
--{
-- name : "CAS"
-- build_source : "cmake"
-- cmake_options : "-DUSE_TCL=OFF -DBUILD_MODULE_Draw=OFF -DUSE_FREETYPE=ON -D3RDPARTY_FREETYPE_DIR=$FREETYPEDIR -DUSE_GL2PS=OFF -DUSE_FREEIMAGE=ON -D3RDPARTY_FREEIMAGE_DIR=$FREEIMAGEDIR"
-- get_source : "git"
-- git_info:
-- {
-- repo : "http://git.dev.opencascade.org/repos/occt.git"
-- repo_dev : $repo
-- }
-- environ :
-- {
-- # OP 19/04/2017 Artifact 8482 : Ajout des variables CAS dans la
-- # section environ pour conserver
-- # la generalite du script CAS.py
-- CSF_ShadersDirectory : $install_dir + $VARS.sep + "share" + $VARS.sep + "opencascade" + $VARS.sep + "resources" + $VARS.sep + "Shaders"
-- CSF_UnitsLexicon : $install_dir + $VARS.sep + "share" + $VARS.sep + "opencascade" + $VARS.sep + "resources" + $VARS.sep + "UnitsAPI" + $VARS.sep + "Lexi_Expr.dat"
-- CSF_UnitsDefinition : $install_dir + $VARS.sep + "share" + $VARS.sep + "opencascade" + $VARS.sep + "resources" + $VARS.sep + "UnitsAPI" + $VARS.sep + "Units.dat"
-- CSF_SHMessage : $install_dir + $VARS.sep + "share" + $VARS.sep + "opencascade" + $VARS.sep + "resources" + $VARS.sep + "SHMessage"
-- CSF_XSMessage : $install_dir + $VARS.sep + "share" + $VARS.sep + "opencascade" + $VARS.sep + "resources" + $VARS.sep + "XSMessage"
-- CSF_MDTVTexturesDirectory : $install_dir + $VARS.sep + "share" + $VARS.sep + "opencascade" + $VARS.sep + "resources" + $VARS.sep + "Textures"
-- MMGT_REENTRANT : "1"
-- CSF_StandardDefaults : $install_dir + $VARS.sep + "share" + $VARS.sep + "opencascade" + $VARS.sep + "resources" + $VARS.sep + "StdResource"
-- CSF_PluginDefaults : $install_dir + $VARS.sep + "share" + $VARS.sep + "opencascade" + $VARS.sep + "resources" + $VARS.sep + "StdResource"
--
-- env_script : $name + ".py"
-- }
-- depend : ['freetype', 'freeimage']
-- build_depend : ["cmake", "doxygen"]
-- source_dir : $APPLICATION.workdir + $VARS.sep + 'SOURCES' + $VARS.sep + $name
-- build_dir : $APPLICATION.workdir + $VARS.sep + 'BUILD' + $VARS.sep + $name
-- install_dir : 'base'
-- properties:
-- {
-- incremental : "no"
-- }
--}
--
--version_CR740_SALOME_PATCH_win :
--{
-- name : "CAS"
-- build_source : "script"
-- compil_script : "CAS_7.4.bat"
-- get_source : "git"
-- git_info:
-- {
-- repo : "http://git.dev.opencascade.org/repos/occt.git"
-- repo_dev : $repo
-- }
-- environ :
-- {
-- CSF_OCCTBinPath : $install_dir + $VARS.sep + "win64" + $VARS.sep + "vc14" + $VARS.sep + "bin"
-- CSF_OCCTLibPath : $install_dir + $VARS.sep + "win64" + $VARS.sep + "vc14" + $VARS.sep + "lib"
-- CSF_OCCTIncludePath : $install_dir + $VARS.sep + "inc"
CSF_OCCTResourcePath : $install_dir + $VARS.sep + "src"
CSF_OCCTDataPath : $install_dir + $VARS.sep + "data"
CSF_OCCTSamplesPath : $install_dir + $VARS.sep + "samples"
'paraview.0005-ParaView_find_cgns.patch',
'paraview.0006-ParaView_find_libxml2.patch',
'paraview.0007-ParaView_find_freetype.patch',
-- 'paraview-0012-LATA_64BITS_IDS.patch',
-- 'ParaView-5.9.0-CATALYST_cmake.patch'
++ 'paraview-0012-LATA_64BITS_IDS.patch'
]
}
'paraview.0004-ParaView_hdf5.patch',
'paraview.0005-ParaView_find_cgns.patch',
'paraview.0006-ParaView_find_libxml2.patch',
-- 'paraview.0007-ParaView_find_freetype.patch',
-- 'ParaView-5.9.0-CATALYST_cmake.patch'
++ 'paraview.0007-ParaView_find_freetype.patch'
]
}
'paraview.0006-ParaView_find_libxml2.patch',
'paraview.0007-ParaView_find_freetype.patch',
'paraview.0008-ParaView_find_zlib.patch',
-- 'paraview-0012-LATA_64BITS_IDS.patch',
-- 'ParaView-5.9.0-CATALYST_cmake.patch'
++ 'paraview-0012-LATA_64BITS_IDS.patch'
]
}
'paraview.0005-ParaView_find_cgns.patch',
'paraview.0006-ParaView_find_libxml2.patch',
'paraview.0007-ParaView_find_freetype.patch',
-- 'paraview.0008-ParaView_find_zlib.patch',
-- 'ParaView-5.9.0-CATALYST_cmake.patch'
++ 'paraview.0008-ParaView_find_zlib.patch'
]
}
'paraview.0006-ParaView_find_libxml2.patch',
'paraview.0007-ParaView_find_freetype.patch',
'paraview.0012-VTKM_MPI.patch',
-- 'paraview-0012-LATA_64BITS_IDS.patch',
-- 'ParaView-5.9.0-CATALYST_cmake.patch'
++ 'paraview-0012-LATA_64BITS_IDS.patch'
]
}
'paraview.0005-ParaView_find_cgns.patch',
'paraview.0006-ParaView_find_libxml2.patch',
'paraview.0007-ParaView_find_freetype.patch',
-- 'paraview.0012-VTKM_MPI.patch',
-- 'ParaView-5.9.0-CATALYST_cmake.patch'
++ 'paraview.0012-VTKM_MPI.patch'
]
}
fi
### Ray-tracing settings
--if [ -n "$OSPRAY_ROOT_DIR" ]
++if [ -n "$OSPRAY_ROOT_DIR" ]
then
CMAKE_OPTIONS="${CMAKE_OPTIONS} -DPARAVIEW_ENABLE_RAYTRACING:BOOL=ON"
CMAKE_OPTIONS="${CMAKE_OPTIONS} -DVTK_ENABLE_OSPRAY:BOOL=ON"
### Python settings
CMAKE_OPTIONS="${CMAKE_OPTIONS} -DPARAVIEW_USE_PYTHON:BOOL=ON"
CMAKE_OPTIONS="${CMAKE_OPTIONS} -DVTK_WRAP_PYTHON:BOOL=ON"
--if [ "${PYTHON_ROOT_DIR}" == "/usr" ]
++if [ "${PYTHON_ROOT_DIR}" != "/usr" ]
then
-- CMAKE_OPTIONS="${CMAKE_OPTIONS} -DPython3_INCLUDE_DIR:STRING=${PYTHON_ROOT_DIR}/include/python${PYTHON_VERSION}m"
-- CMAKE_OPTIONS="${CMAKE_OPTIONS} -DPython3_LIBRARY:STRING=${PYTHON_ROOT_DIR}/lib64/libpython${PYTHON_VERSION}m.so"
--else
CMAKE_OPTIONS="${CMAKE_OPTIONS} -DPython3_INCLUDE_DIR:STRING=${PYTHON_ROOT_DIR}/include/python${PYTHON_VERSION}"
CMAKE_OPTIONS="${CMAKE_OPTIONS} -DPython3_LIBRARY:STRING=${PYTHON_ROOT_DIR}/lib/libpython${PYTHON_VERSION}.so"
fi
### CGNS
CMAKE_OPTIONS="${CMAKE_OPTIONS} -DVTK_MODULE_USE_EXTERNAL_ParaView_cgns:BOOL=ON"
--CMAKE_OPTIONS="${CMAKE_OPTIONS} -DCGNS_INCLUDE_DIR:PATH=${CGNS_ROOT_DIR}/include"
--if [ "$CGNS_ROOT_DIR" == "/usr" ]
++if [ "$CGNS_ROOT_DIR" != "/usr" ]
then
-- CMAKE_OPTIONS="${CMAKE_OPTIONS} -DCGNS_LIBRARY:PATH=${CGNS_ROOT_DIR}/lib64/libcgns.so"
--else
++ CMAKE_OPTIONS="${CMAKE_OPTIONS} -DCGNS_INCLUDE_DIR:PATH=${CGNS_ROOT_DIR}/include"
CMAKE_OPTIONS="${CMAKE_OPTIONS} -DCGNS_LIBRARY:PATH=${CGNS_ROOT_DIR}/lib/libcgns.so"
fi
CMAKE_OPTIONS="${CMAKE_OPTIONS} -DVTK_MODULE_ENABLE_ParaView_cgns:INTERNAL=YES"
CMAKE_OPTIONS="${CMAKE_OPTIONS} -DVTK_MODULE_USE_EXTERNAL_VTK_gl2ps:BOOL=OFF"
### libxml2 settings
--if [ -n "$LIBXML2_ROOT_DIR" ]
++if [ -n "$LIBXML2_ROOT_DIR" ]
then
# with a native libxml2, do not use these options
CMAKE_OPTIONS="${CMAKE_OPTIONS} -DVTK_MODULE_USE_EXTERNAL_VTK_libxml2:BOOL=ON"
-- CMAKE_OPTIONS="${CMAKE_OPTIONS} -DLIBXML2_INCLUDE_DIR:STRING=${LIBXML2_ROOT_DIR}/include/libxml2"
-- if [ "${LIBXML2_ROOT_DIR}" == "/usr" ]
++ if [ "${LIBXML2_ROOT_DIR}" != "/usr" ]
then
-- CMAKE_OPTIONS="${CMAKE_OPTIONS} -DLIBXML2_LIBRARIES:STRING=${LIBXML2_ROOT_DIR}/lib64/libxml2.so"
-- else
++ CMAKE_OPTIONS="${CMAKE_OPTIONS} -DLIBXML2_INCLUDE_DIR:STRING=${LIBXML2_ROOT_DIR}/include/libxml2"
CMAKE_OPTIONS="${CMAKE_OPTIONS} -DLIBXML2_LIBRARIES:STRING=${LIBXML2_ROOT_DIR}/lib/libxml2.so"
++ CMAKE_OPTIONS="${CMAKE_OPTIONS} -DLIBXML2_XMLLINT_EXECUTABLE=${LIBXML2_ROOT_DIR}/bin/xmllint"
fi
-- CMAKE_OPTIONS="${CMAKE_OPTIONS} -DLIBXML2_XMLLINT_EXECUTABLE=${LIBXML2_ROOT_DIR}/bin/xmllint"
fi
### freetype settings
CMAKE_OPTIONS="${CMAKE_OPTIONS} -DVTK_MODULE_USE_EXTERNAL_VTK_freetype:BOOL=ON"
--if [ -n "$FREETYPE_ROOT_DIR" ]
++if [ -n "$FREETYPE_ROOT_DIR" ]
then
# with a native freetype, do not use these options
CMAKE_OPTIONS="${CMAKE_OPTIONS} -DFREETYPE_INCLUDE_DIRS:STRING=${FREETYPE_ROOT_DIR}/include/freetype2"
echo
echo "########## END"
--
### OpenGL settings
CMAKE_OPTIONS="${CMAKE_OPTIONS} -DOpenGL_GL_PREFERENCE:STRING=LEGACY"
--CMAKE_OPTIONS="${CMAKE_OPTIONS} -DPARAVIEW_USE_CATALYST:BOOL=ON"
--CMAKE_OPTIONS="${CMAKE_OPTIONS} -DCATALYST_BUILD_STUB_IMPLEMENTATION:BOOL=ON"
++CMAKE_OPTIONS="${CMAKE_OPTIONS} -DPARAVIEW_USE_CATALYST:BOOL=OFF"
++#CMAKE_OPTIONS="${CMAKE_OPTIONS} -DCATALYST_BUILD_STUB_IMPLEMENTATION:BOOL=ON"
### spns #20550 - Headless mode
if [ -n "$PARAVIEW_HEADLESS_MODE" ]
then
fi
### Ray-tracing settings
--if [ -n "$OSPRAY_ROOT_DIR" ]
++if [ -n "$OSPRAY_ROOT_DIR" ]
then
CMAKE_OPTIONS="${CMAKE_OPTIONS} -DPARAVIEW_ENABLE_RAYTRACING:BOOL=ON"
CMAKE_OPTIONS="${CMAKE_OPTIONS} -DVTK_ENABLE_OSPRAY:BOOL=ON"
### Python settings
CMAKE_OPTIONS="${CMAKE_OPTIONS} -DPARAVIEW_USE_PYTHON:BOOL=ON"
CMAKE_OPTIONS="${CMAKE_OPTIONS} -DVTK_WRAP_PYTHON:BOOL=ON"
--if [ "${PYTHON_ROOT_DIR}" == "/usr" ]
++if [ "${PYTHON_ROOT_DIR}" != "/usr" ]
then
-- CMAKE_OPTIONS="${CMAKE_OPTIONS} -DPython3_INCLUDE_DIR:STRING=${PYTHON_ROOT_DIR}/include/python${PYTHON_VERSION}m"
-- CMAKE_OPTIONS="${CMAKE_OPTIONS} -DPython3_LIBRARY:STRING=${PYTHON_ROOT_DIR}/lib64/libpython${PYTHON_VERSION}m.so"
--else
CMAKE_OPTIONS="${CMAKE_OPTIONS} -DPython3_INCLUDE_DIR:STRING=${PYTHON_ROOT_DIR}/include/python${PYTHON_VERSION}"
CMAKE_OPTIONS="${CMAKE_OPTIONS} -DPython3_LIBRARY:STRING=${PYTHON_ROOT_DIR}/lib/libpython${PYTHON_VERSION}.so"
fi
### CGNS
CMAKE_OPTIONS="${CMAKE_OPTIONS} -DVTK_MODULE_USE_EXTERNAL_ParaView_cgns:BOOL=ON"
--CMAKE_OPTIONS="${CMAKE_OPTIONS} -DCGNS_INCLUDE_DIR:PATH=${CGNS_ROOT_DIR}/include"
--if [ "$CGNS_ROOT_DIR" == "/usr" ]
++if [ "$CGNS_ROOT_DIR" != "/usr" ]
then
-- CMAKE_OPTIONS="${CMAKE_OPTIONS} -DCGNS_LIBRARY:PATH=${CGNS_ROOT_DIR}/lib64/libcgns.so"
--else
++ CMAKE_OPTIONS="${CMAKE_OPTIONS} -DCGNS_INCLUDE_DIR:PATH=${CGNS_ROOT_DIR}/include"
CMAKE_OPTIONS="${CMAKE_OPTIONS} -DCGNS_LIBRARY:PATH=${CGNS_ROOT_DIR}/lib/libcgns.so"
fi
CMAKE_OPTIONS="${CMAKE_OPTIONS} -DVTK_MODULE_ENABLE_ParaView_cgns:INTERNAL=YES"
CMAKE_OPTIONS="${CMAKE_OPTIONS} -DVTK_MODULE_USE_EXTERNAL_VTK_gl2ps:BOOL=OFF"
### libxml2 settings
--if [ -n "$LIBXML2_ROOT_DIR" ]
++if [ -n "$LIBXML2_ROOT_DIR" ]
then
# with a native libxml2, do not use these options
CMAKE_OPTIONS="${CMAKE_OPTIONS} -DVTK_MODULE_USE_EXTERNAL_VTK_libxml2:BOOL=ON"
-- CMAKE_OPTIONS="${CMAKE_OPTIONS} -DLIBXML2_INCLUDE_DIR:STRING=${LIBXML2_ROOT_DIR}/include/libxml2"
-- if [ "${LIBXML2_ROOT_DIR}" == "/usr" ]
++ if [ "${LIBXML2_ROOT_DIR}" != "/usr" ]
then
-- CMAKE_OPTIONS="${CMAKE_OPTIONS} -DLIBXML2_LIBRARIES:STRING=${LIBXML2_ROOT_DIR}/lib64/libxml2.so"
-- else
++ CMAKE_OPTIONS="${CMAKE_OPTIONS} -DLIBXML2_INCLUDE_DIR:STRING=${LIBXML2_ROOT_DIR}/include/libxml2"
CMAKE_OPTIONS="${CMAKE_OPTIONS} -DLIBXML2_LIBRARIES:STRING=${LIBXML2_ROOT_DIR}/lib/libxml2.so"
++ CMAKE_OPTIONS="${CMAKE_OPTIONS} -DLIBXML2_XMLLINT_EXECUTABLE=${LIBXML2_ROOT_DIR}/bin/xmllint"
fi
-- CMAKE_OPTIONS="${CMAKE_OPTIONS} -DLIBXML2_XMLLINT_EXECUTABLE=${LIBXML2_ROOT_DIR}/bin/xmllint"
fi
### freetype settings
CMAKE_OPTIONS="${CMAKE_OPTIONS} -DVTK_MODULE_USE_EXTERNAL_VTK_freetype:BOOL=ON"
--if [ -n "$FREETYPE_ROOT_DIR" ]
++if [ -n "$FREETYPE_ROOT_DIR" ]
then
# with a native freetype, do not use these options
CMAKE_OPTIONS="${CMAKE_OPTIONS} -DFREETYPE_INCLUDE_DIRS:STRING=${FREETYPE_ROOT_DIR}/include/freetype2"
echo
echo "########## END"
--
+++ /dev/null
--#!/usr/bin/env python
--#-*- coding:utf-8 -*-
--
--def set_env(env, prereq_dir, version):
-- env.set('HOMARD_REP_EXE', prereq_dir)
-- root = env.get('HOMARD_REP_EXE')
-- env.set('HOMARD_EXE', 'homard')
--
-- env.prepend('PATH', root)
--
--def set_nativ_env(env):
-- pass
--- /dev/null
--- /dev/null
++#!/usr/bin/env python
++#-*- coding:utf-8 -*-
++
++def set_env(env, prereq_dir, version):
++ env.set('HOMARD_REP_EXE', prereq_dir)
++ root = env.get('HOMARD_REP_EXE')
++ env.set('HOMARD_EXE', 'homard')
++
++ env.prepend('PATH', root)
++
++def set_nativ_env(env):
++ pass
get_source : "archive"
environ :
{
-- env_script : "Homard.py"
++ env_script : "Homard_bin.py"
}
depend : []
source_dir : $APPLICATION.workdir + $VARS.sep + 'SOURCES' + $VARS.sep + $name
archive_info : {archive_name : "Homard-11.11.tar.gz"}
environ :
{
-- env_script : "Homard.py"
++ env_script : "Homard_bin.py"
}
depend : []
source_dir : $APPLICATION.workdir + $VARS.sep + 'SOURCES' + $VARS.sep + $name
get_source : "archive"
environ :
{
-- env_script : $name + ".py"
++ env_script : "Homard_bin.py"
}
depend : []
source_dir : $APPLICATION.workdir + $VARS.sep + 'SOURCES' + $VARS.sep + $name
+++ /dev/null
--diff --git a/cmake/FindSalomeTBB.cmake b/cmake/FindSalomeTBB.cmake
--index 6e41f63..e5aa8d5 100644
----- a/cmake/FindSalomeTBB.cmake
--+++ b/cmake/FindSalomeTBB.cmake
--@@ -20,9 +20,10 @@
-- IF(NOT DEFINED MACHINE_IS_64)
-- MESSAGE(FATAL_ERROR "Developer error -> SalomeSetupPlatform macros should be inclided before find_package(SalomeTBB) !")
-- ENDIF()
---
---SALOME_FIND_PACKAGE_AND_DETECT_CONFLICTS(TBB TBB_INCLUDE_DIRS 1)
---
--+Find_package(TBB)
--+#SALOME_FIND_PACKAGE_AND_DETECT_CONFLICTS(TBB TBB_INCLUDE_DIRS 1)
--+MESSAGE(WARNING "TBB_INCLUDE_DIRS = ${TBB_INCLUDE_DIRS}")
--+MESSAGE(WARNING "TBB_LIBRARIES = ${TBB_LIBRARIES}")
-- IF(TBB_INCLUDE_DIRS AND TBB_LIBRARIES)
-- # No config mode
-- MARK_AS_ADVANCED(TBB_INCLUDE_DIRS TBB_LIBRARIES)
--@@ -57,4 +58,4 @@ IF(TBB_FOUND)
-- SALOME_ACCUMULATE_HEADERS(_tbb_inc)
-- SALOME_ACCUMULATE_ENVIRONMENT(LD_LIBRARY_PATH ${_tbb_lib})
-- ENDIF()
---ENDIF()
--\ No newline at end of file
--+ENDIF()
+++ /dev/null
--diff --git a/src/GraphicsView/GraphicsView_ViewFrame.cxx b/src/GraphicsView/GraphicsView_ViewFrame.cxx
--index f075f23..1ba3cb7 100644
----- a/src/GraphicsView/GraphicsView_ViewFrame.cxx
--+++ b/src/GraphicsView/GraphicsView_ViewFrame.cxx
--@@ -42,7 +42,7 @@
-- #include <QMouseEvent>
-- #include <QString>
-- #include <QWheelEvent>
---
--+#include <QPainterPath>
-- //=======================================================================
-- // Name : GraphicsView_ViewFrame
-- // Purpose : Constructor
--diff --git a/src/GraphicsView/GraphicsView_ViewFrame.h b/src/GraphicsView/GraphicsView_ViewFrame.h
--index a8507d3..ffa7c35 100644
----- a/src/GraphicsView/GraphicsView_ViewFrame.h
--+++ b/src/GraphicsView/GraphicsView_ViewFrame.h
--@@ -29,7 +29,7 @@ class QGraphicsSceneMouseEvent;
-- class QGraphicsSceneWheelEvent;
--
-- class QAction;
---
--+class QPainterPath;
-- class SUIT_Desktop;
--
-- class GraphicsView_Viewer;
--diff --git a/src/PVViewer/PVViewer_GUIElements.cxx b/src/PVViewer/PVViewer_GUIElements.cxx
--index 384d362..5d9d4f5 100644
----- a/src/PVViewer/PVViewer_GUIElements.cxx
--+++ b/src/PVViewer/PVViewer_GUIElements.cxx
--@@ -143,7 +143,9 @@ void PVViewer_GUIElements::buildPVWidgets()
-- // Catalyst Menu
-- if (!catalystMenu) {
-- catalystMenu = new QMenu(0);
---#if PARAVIEW_VERSION_MAJOR==5 && PARAVIEW_VERSION_MINOR>=6
--+#if PARAVIEW_VERSION_MAJOR==5 && PARAVIEW_VERSION_MINOR>=9
--+ pqParaViewMenuBuilders::buildCatalystMenu(*catalystMenu);
--+#elif PARAVIEW_VERSION_MAJOR==5 && PARAVIEW_VERSION_MINOR>=6
-- pqParaViewMenuBuilders::buildCatalystMenu(*catalystMenu, myDesktop);
-- #else
-- pqParaViewMenuBuilders::buildCatalystMenu(*catalystMenu);
--diff --git a/src/SALOME_PYQT/SalomePyQt/SalomePyQt.sip b/src/SALOME_PYQT/SalomePyQt/SalomePyQt.sip
--index bc30e34..05dff3e 100644
----- a/src/SALOME_PYQT/SalomePyQt/SalomePyQt.sip
--+++ b/src/SALOME_PYQT/SalomePyQt/SalomePyQt.sip
--@@ -130,9 +130,9 @@ class QtxAction : QWidgetAction
--
-- %ConvertToSubClassCode
-- if ( qobject_cast<QtxAction*>( sipCpp ) )
--- sipClass = sipClass_QtxAction;
--+ sipType = sipType_QtxAction;
-- else
--- sipClass = NULL;
--+ sipType = NULL;
-- %End
--
-- public:
--@@ -153,9 +153,9 @@ class QtxActionSet : QtxAction
--
-- %ConvertToSubClassCode
-- if ( qobject_cast<QtxActionSet*>( sipCpp ) )
--- sipClass = sipClass_QtxActionSet;
--+ sipType = sipType_QtxActionSet;
-- else
--- sipClass = NULL;
--+ sipType = NULL;
-- %End
--
-- public:
--@@ -192,9 +192,9 @@ class QtxActionGroup : QtxActionSet
--
-- %ConvertToSubClassCode
-- if ( qobject_cast<QtxActionGroup*>( sipCpp ) )
--- sipClass = sipClass_QtxActionGroup;
--+ sipType = sipType_QtxActionGroup;
-- else
--- sipClass = NULL;
--+ sipType = NULL;
-- %End
--
-- public:
--@@ -226,9 +226,9 @@ class QtxTreeView : public QTreeView
--
-- %ConvertToSubClassCode
-- if ( qobject_cast<QtxTreeView*>( sipCpp ) )
--- sipClass = sipClass_QtxTreeView;
--+ sipType = sipType_QtxTreeView;
-- else
--- sipClass = NULL;
--+ sipType = NULL;
-- %End
--
-- public:
--@@ -252,9 +252,9 @@ class UserDefinedContent : public QWidget
--
-- %ConvertToSubClassCode
-- if ( qobject_cast<UserDefinedContent*>( sipCpp ) )
--- sipClass = sipClass_UserDefinedContent;
--+ sipType = sipType_UserDefinedContent;
-- else
--- sipClass = NULL;
--+ sipType = NULL;
-- %End
--
-- public:
--diff --git a/src/SALOME_PYQT/SalomePyQt/SalomePyQt_Plot2d.sip b/src/SALOME_PYQT/SalomePyQt/SalomePyQt_Plot2d.sip
--index 66e2af5..eb0962e 100644
----- a/src/SALOME_PYQT/SalomePyQt/SalomePyQt_Plot2d.sip
--+++ b/src/SALOME_PYQT/SalomePyQt/SalomePyQt_Plot2d.sip
--@@ -55,9 +55,9 @@ class Plot2d_Curve
--
-- %ConvertToSubClassCode
-- if ( dynamic_cast<Plot2d_Curve*>( sipCpp ) )
--- sipClass = sipClass_Plot2d_Curve;
--+ sipType = sipType_Plot2d_Curve;
-- else
--- sipClass = NULL;
--+ sipType = NULL;
-- %End
--
-- public:
+++ /dev/null
--diff --git a/src/HYBRIDPlugin/HYBRIDPlugin_HYBRID.cxx b/src/HYBRIDPlugin/HYBRIDPlugin_HYBRID.cxx
--index a773a0e..b6f31da 100644
----- a/src/HYBRIDPlugin/HYBRIDPlugin_HYBRID.cxx
--+++ b/src/HYBRIDPlugin/HYBRIDPlugin_HYBRID.cxx
--@@ -70,6 +70,7 @@
-- #include <Basics_Utils.hxx>
-- #include <utilities.h>
--
--+#include <fstream>
-- #include <algorithm>
--
-- #define castToNode(n) static_cast<const SMDS_MeshNode *>( n );
--@@ -815,7 +816,7 @@ static bool readGMFFile(MG_HYBRID_API* MGOutput,
-- std::map<int, std::set<int> >::const_iterator subdomainIt = subdomainId2tetraId.begin();
-- std::string aSubdomainFileName = theFile;
-- aSubdomainFileName = aSubdomainFileName + ".subdomain";
--- ofstream aSubdomainFile ( aSubdomainFileName , ios::out);
--+ std::ofstream aSubdomainFile ( aSubdomainFileName , ios::out);
--
-- aSubdomainFile << "Nb subdomains " << subdomainId2tetraId.size() << std::endl;
-- for(;subdomainIt != subdomainId2tetraId.end() ; ++subdomainIt) {
--@@ -1489,7 +1490,7 @@ bool HYBRIDPlugin_HYBRID::Compute(SMESH_Mesh& theMesh,
-- // Write aSmdsToHybridIdMap to temp file
-- std::string aSmdsToHybridIdMapFileName;
-- aSmdsToHybridIdMapFileName = aGenericName + ".ids"; // ids relation
--- ofstream aIdsFile ( aSmdsToHybridIdMapFileName , ios::out);
--+ std::ofstream aIdsFile ( aSmdsToHybridIdMapFileName , ios::out);
-- Ok = aIdsFile.rdbuf()->is_open();
-- if (!Ok) {
-- INFOS( "Can't write into " << aSmdsToHybridIdMapFileName);
+++ /dev/null
--diff --git a/src/PVGUI/PVGUI_Module.cxx b/src/PVGUI/PVGUI_Module.cxx
--index 08fc02d..a472ce0 100644
----- a/src/PVGUI/PVGUI_Module.cxx
--+++ b/src/PVGUI/PVGUI_Module.cxx
--@@ -798,7 +798,7 @@ QString PVGUI_Module::getTraceString()
--
-- vtkSMTrace* tracer = vtkSMTrace::GetActiveTracer();
-- if ( tracer ) {
--- traceString = tracer->GetCurrentTrace();
--+ traceString = tracer->GetCurrentTrace().c_str();
-- // 'import pvsimple' is necessary to fix the first call to DisableFirstRenderCamera in the paraview trace
-- // 'ShowParaviewView()' ensure there is an opened viewing window (otherwise SEGFAULT!)
-- traceString = "import pvsimple" + end_line +
--diff --git a/src/Plugins/JSONReader/plugin/JSONReaderModule/vtkJSONReader.cxx b/src/Plugins/JSONReader/plugin/JSONReaderModule/vtkJSONReader.cxx
--index ff72f76..082b322 100644
----- a/src/Plugins/JSONReader/plugin/JSONReaderModule/vtkJSONReader.cxx
--+++ b/src/Plugins/JSONReader/plugin/JSONReaderModule/vtkJSONReader.cxx
--@@ -34,7 +34,7 @@
--
-- #include <stdexcept>
-- #include <sstream>
---
--+#include <fstream>
-- // Key words
-- #define MD "_metadata"
-- #define CMT "_comment"
--@@ -183,7 +183,7 @@ int vtkJSONReader::CanParseFile(const char *fname, Json::Value &root)
-- return 0;
-- }
--
--- ifstream file;
--+ std::ifstream file;
-- std::ostringstream oss;
-- bool parsedSuccess = true;
-- Json::Reader reader;
--diff --git a/src/Plugins/MEDReader/plugin/MEDLoaderForPV/MEDFileFieldRepresentationTree.cxx b/src/Plugins/MEDReader/plugin/MEDLoaderForPV/MEDFileFieldRepresentationTree.cxx
--index 61edea6..6b1857b 100644
----- a/src/Plugins/MEDReader/plugin/MEDLoaderForPV/MEDFileFieldRepresentationTree.cxx
--+++ b/src/Plugins/MEDReader/plugin/MEDLoaderForPV/MEDFileFieldRepresentationTree.cxx
--@@ -43,7 +43,7 @@
-- #include "vtkInformationQuadratureSchemeDefinitionVectorKey.h"
-- #include "vtkInformationIntegerKey.h"
-- #include "vtkInformation.h"
---#include "vtkDataArrayTemplate.h"
--+#include "vtkAOSDataArrayTemplate.h"
-- #include "vtkIdTypeArray.h"
-- #include "vtkDoubleArray.h"
-- #include "vtkIntArray.h"
--@@ -118,7 +118,7 @@ vtkIdTypeArray *ELGACmp::isExisting(const std::vector<std::string>& locsReallyUs
-- template<class T>
-- vtkIdTypeArray *ELGACmp::createNew(const MEDCoupling::MEDFileFieldGlobsReal *globs, const std::vector<std::string>& locsReallyUsed, vtkDataArray *vtkd, vtkDataSet *ds, ExportedTinyInfo *internalInfo) const
-- {
--- const int VTK_DATA_ARRAY_DELETE=vtkDataArrayTemplate<T>::VTK_DATA_ARRAY_DELETE;
--+ const int VTK_DATA_ARRAY_DELETE=vtkAOSDataArrayTemplate<T>::VTK_DATA_ARRAY_DELETE;
-- std::vector< std::vector<std::string> > locNames(_loc_names);
-- std::vector<vtkIdTypeArray *> elgas(_elgas);
-- std::vector< std::pair< vtkQuadratureSchemeDefinition *, unsigned char > > defs;
--@@ -263,9 +263,9 @@ template<class T>
-- void AssignDataPointerToVTK(typename MEDFileVTKTraits<T>::VtkType *vtkTab, typename MEDFileVTKTraits<T>::MCType *mcTab, bool noCpyNumNodes)
-- {
-- if(noCpyNumNodes)
--- vtkTab->SetArray(mcTab->getPointer(),mcTab->getNbOfElems(),1,vtkDataArrayTemplate<T>::VTK_DATA_ARRAY_FREE);
--+ vtkTab->SetArray(mcTab->getPointer(),mcTab->getNbOfElems(),1,vtkAOSDataArrayTemplate<T>::VTK_DATA_ARRAY_FREE);
-- else
--- { vtkTab->SetArray(mcTab->getPointer(),mcTab->getNbOfElems(),0,vtkDataArrayTemplate<T>::VTK_DATA_ARRAY_FREE); mcTab->accessToMemArray().setSpecificDeallocator(0); }
--+ { vtkTab->SetArray(mcTab->getPointer(),mcTab->getNbOfElems(),0,vtkAOSDataArrayTemplate<T>::VTK_DATA_ARRAY_FREE); mcTab->accessToMemArray().setSpecificDeallocator(0); }
-- }
--
-- // here copy is always assumed.
--@@ -291,7 +291,7 @@ void AssignToFieldData(DataArray *vPtr, const MEDTimeReq *tr, vtkFieldData *att,
-- const std::vector<TypeOfField>& discs, const ELGACmp& elgaCmp, const MEDCoupling::MEDFileFieldGlobsReal *globs,
-- MEDFileAnyTypeField1TS *f1ts, vtkDataSet *ds, ExportedTinyInfo *internalInfo)
-- {
--- const int VTK_DATA_ARRAY_DELETE=vtkDataArrayTemplate<T>::VTK_DATA_ARRAY_DELETE;
--+ const int VTK_DATA_ARRAY_DELETE=vtkAOSDataArrayTemplate<T>::VTK_DATA_ARRAY_DELETE;
-- typename MEDFileVTKTraits<T>::MCType *vi(static_cast<typename MEDFileVTKTraits<T>::MCType *>(vPtr));
-- typename MEDFileVTKTraits<T>::VtkType *vtkd(MEDFileVTKTraits<T>::VtkType::New());
-- vtkd->SetNumberOfComponents((int)vi->getNumberOfComponents());
--diff --git a/src/Plugins/MEDReader/plugin/MEDLoaderForPV/vtkGenerateVectors.cxx b/src/Plugins/MEDReader/plugin/MEDLoaderForPV/vtkGenerateVectors.cxx
--index 56cc316..53f2f4c 100644
----- a/src/Plugins/MEDReader/plugin/MEDLoaderForPV/vtkGenerateVectors.cxx
--+++ b/src/Plugins/MEDReader/plugin/MEDLoaderForPV/vtkGenerateVectors.cxx
--@@ -19,7 +19,7 @@
-- // Author : Anthony Geay
--
-- #include "vtkGenerateVectors.h"
---#include "vtkDataArrayTemplate.h"
--+#include "vtkAOSDataArrayTemplate.h"
-- #include "vtkDoubleArray.h"
-- #include "vtkInformation.h"
-- #include "vtkUnstructuredGrid.h"
--@@ -83,7 +83,7 @@ void vtkGenerateVectors::Operate(vtkFieldData *fd)
--
-- vtkDoubleArray *vtkGenerateVectors::Operate2Compo(vtkDoubleArray *oldArr)
-- {
--- const int VTK_DATA_ARRAY_FREE=vtkDataArrayTemplate<double>::VTK_DATA_ARRAY_FREE;
--+ const int VTK_DATA_ARRAY_FREE=vtkAOSDataArrayTemplate<double>::VTK_DATA_ARRAY_FREE;
-- vtkDoubleArray *ret(vtkDoubleArray::New());
-- vtkIdType nbOfTuples(oldArr->GetNumberOfTuples());
-- const double *inPt(oldArr->GetPointer(0));
--@@ -106,7 +106,7 @@ vtkDoubleArray *vtkGenerateVectors::Operate2Compo(vtkDoubleArray *oldArr)
--
-- vtkDoubleArray *vtkGenerateVectors::OperateMoreThan3Compo(vtkDoubleArray *oldArr)
-- {
--- const int VTK_DATA_ARRAY_FREE=vtkDataArrayTemplate<double>::VTK_DATA_ARRAY_FREE;
--+ const int VTK_DATA_ARRAY_FREE=vtkAOSDataArrayTemplate<double>::VTK_DATA_ARRAY_FREE;
-- vtkDoubleArray *ret(vtkDoubleArray::New());
-- int nbOfCompo(oldArr->GetNumberOfComponents());
-- vtkIdType nbOfTuples(oldArr->GetNumberOfTuples());
--diff --git a/src/Plugins/MEDReader/plugin/MEDReaderIO/vtkExtractCellType.cxx b/src/Plugins/MEDReader/plugin/MEDReaderIO/vtkExtractCellType.cxx
--index bb3fc7c..03a0b8b 100644
----- a/src/Plugins/MEDReader/plugin/MEDReaderIO/vtkExtractCellType.cxx
--+++ b/src/Plugins/MEDReader/plugin/MEDReaderIO/vtkExtractCellType.cxx
--@@ -23,7 +23,7 @@
-- #include "MEDFileFieldOverView.hxx"
--
-- #include "vtkAdjacentVertexIterator.h"
---#include "vtkDataArrayTemplate.h"
--+#include "vtkAOSDataArrayTemplate.h"
-- #include "vtkIntArray.h"
-- #include "vtkCellData.h"
-- #include "vtkPointData.h"
--@@ -371,7 +371,7 @@ int vtkExtractCellType::RequestInformation(vtkInformation * /*request*/, vtkInfo
--
-- vtkDataSet *FilterFamilies(vtkDataSet *input, const std::vector<int>& idsToKeep, bool insideOut)
-- {
--- const int VTK_DATA_ARRAY_DELETE=vtkDataArrayTemplate<double>::VTK_DATA_ARRAY_DELETE;
--+ const int VTK_DATA_ARRAY_DELETE=vtkAOSDataArrayTemplate<double>::VTK_DATA_ARRAY_DELETE;
-- const char ZE_SELECTION_ARR_NAME[]="@@ZeSelection@@";
-- vtkDataSet *output(input->NewInstance());
-- output->ShallowCopy(input);
--diff --git a/src/Plugins/MEDReader/plugin/MEDReaderIO/vtkExtractGroup.cxx b/src/Plugins/MEDReader/plugin/MEDReaderIO/vtkExtractGroup.cxx
--index 5996b95..40a76ea 100644
----- a/src/Plugins/MEDReader/plugin/MEDReaderIO/vtkExtractGroup.cxx
--+++ b/src/Plugins/MEDReader/plugin/MEDReaderIO/vtkExtractGroup.cxx
--@@ -25,7 +25,7 @@
-- #include "VTKMEDTraits.hxx"
--
-- #include "vtkAdjacentVertexIterator.h"
---#include "vtkDataArrayTemplate.h"
--+#include "vtkAOSDataArrayTemplate.h"
-- #include "vtkIntArray.h"
-- #include "vtkLongArray.h"
-- #ifdef WIN32
--@@ -135,7 +135,7 @@ vtkDataSet *FilterFamilies(vtkSmartPointer<vtkThreshold>& thres,
-- vtkDataSet *input, const std::set<int>& idsToKeep, bool insideOut, const char *arrNameOfFamilyField,
-- const char *associationForThreshold, bool& catchAll, bool& catchSmth)
-- {
--- const int VTK_DATA_ARRAY_DELETE=vtkDataArrayTemplate<double>::VTK_DATA_ARRAY_DELETE;
--+ const int VTK_DATA_ARRAY_DELETE=vtkAOSDataArrayTemplate<double>::VTK_DATA_ARRAY_DELETE;
-- const char ZE_SELECTION_ARR_NAME[]="@@ZeSelection@@";
-- vtkDataSet *output(input->NewInstance());
-- output->ShallowCopy(input);
--diff --git a/src/Plugins/MEDReader/plugin/MEDReaderIO/vtkInformationGaussDoubleVectorKey.h b/src/Plugins/MEDReader/plugin/MEDReaderIO/vtkInformationGaussDoubleVectorKey.h
--index 47429cd..13cb054 100644
----- a/src/Plugins/MEDReader/plugin/MEDReaderIO/vtkInformationGaussDoubleVectorKey.h
--+++ b/src/Plugins/MEDReader/plugin/MEDReaderIO/vtkInformationGaussDoubleVectorKey.h
--@@ -26,7 +26,7 @@ class VTK_EXPORT vtkInformationGaussDoubleVectorKey : public vtkInformationDoubl
-- {
-- public:
-- vtkTypeMacro(vtkInformationGaussDoubleVectorKey, vtkInformationDoubleVectorKey)
--- void PrintSelf(ostream& /*os*/, vtkIndent /*indent*/) VTK_OVERRIDE{}
--+ void PrintSelf(ostream& /*os*/, vtkIndent /*indent*/) override {};
--
-- vtkInformationGaussDoubleVectorKey(const char* name, const char* location,
-- int length = -1) : vtkInformationDoubleVectorKey(name, location, length) { }
--@@ -48,7 +48,7 @@ public:
-- */
-- void CopyDefaultInformation(vtkInformation* /*request*/,
-- vtkInformation* fromInfo,
--- vtkInformation* toInfo) VTK_OVERRIDE
--+ vtkInformation* toInfo) override
-- {
-- this->ShallowCopy(fromInfo, toInfo);
-- }
--- /dev/null
--- /dev/null
++--- ParaView/Qt/Core/CMakeLists.txt 2021-02-04 15:22:02.000000000 +0100
+++++ ParaView_new/Qt/Core/CMakeLists.txt 2021-03-24 19:07:19.332728213 +0100
++@@ -165,7 +165,7 @@
++ vtk_module_find_package(
++ PACKAGE Qt5
++ COMPONENTS ${qt_components}
++- VERSION 5.12
+++ VERSION 5.11
++ FORWARD_VERSION_REQ MINOR)
++
++ set(CMAKE_AUTOMOC 1)
