embree : '3.12.2'
freeimage : '3.16.0'
freetype : '2.9.1'
- glfw : 'native'
graphviz : '2.38.0'
hdf5 : '1.10.3'
idna : '2.7'
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 : OpenMP # OpenMP # choose among: sequential / OpenMP / TBB switches
}
launch : {PYTHONIOENCODING:"UTF_8", SALOME_MODULES_ORDER:"SHAPER:SHAPERSTUDY:GEOM:SMESH"}
SALOME_trace : "local" # local/file:.../with_logger
boost : '1.58.0'
CAS : {tag: 'CR750-SALOME-PATCH', section: 'version_V7_5_0'}
certifi : '2018.8.24'
- cgns : {tag : '3.3.1', hpc : 'yes'}
+ cgns : {tag : '4.1.1', hpc : 'yes'}
chardet : '3.0.4'
click : '6.7'
cmake : '3.12.1'
docutils : '0.12'
doxygen : '1.8.14'
eigen : '3.3.4'
- embree : '3.3.0'
+ embree : '3.12.2'
freeimage : '3.16.0'
freetype : '2.9.1'
gmsh : '4.1.4'
graphviz : '2.38.0'
hdf5 : {tag : '1.10.3', hpc : 'yes'}
- homard_bin : '11.12_hdf51103med410'
idna : '2.7'
imagesize : '1.0.0'
- ispc : '1.9.2'
+ ispc : '1.15.0'
Jinja2 : '2.7.3'
kiwisolver : '1.0.1'
lapack : '3.8.0'
opencv : '3.2.0'
openmpi : '3.1.6'
openssl : "native"
-# openturns: '1.16'
- ospray : '1.8.4'
+ openturns: '1.16'
+ openVKL: '0.11.0'
+ ospray : '2.4.0'
packaging : '17.1'
- ParaView : {tag : '5.8.0', hpc : 'yes', section: 'version_5_8_0_MPI'}
+ ParaView : {tag : '5.9.0', hpc : 'yes', section: 'version_5_9_0_MPI'}
petsc : '3.14.0'
Pillow : '7.1.1'
planegcs : '0.18-3cb6890'
psutil : '5.7.2'
Pygments : '2.0.2'
pyparsing : '2.0.3'
- PyQt : '5.9'
- PyQtChart : '5.9'
+ PyQt : '5.15.3'
+ #PyQtChart : '5.9'
pyreadline : '2.0'
Python : '3.6.5'
pytz : '2015.7'
- qt : '5.9.1'
+ qt : '5.12.10'
qwt : '6.1.2'
requests : '2.19.1'
+ rkCommon : '1.5.1'
root: '6.22.02'
scipy : '0.19.1'
scotch : '6.0.4'
setuptools : '38.4.0'
- sip : '4.19.3'
+ sip : '5.5.0'
six : '1.10.0'
snowballstemmer : '1.2.1'
Sphinx : '1.7.6'
tcl : '8.6.0'
tk : '8.6.0'
urllib3 : '1.23'
-# URANIE : '4.5.0'
+ URANIE : '4.5.0'
# SALOME MODULES :
'CONFIGURATION'
'SALOME'
}
__overwrite__ :
[
- {
- #
- __condition__ : "VARS.dist in ['UB20.04']"
- 'PRODUCTS.qt.version_5_9_1.patches' : ['qt-5.9.1-UB20-FD32-socketcanbackend.patch']
- }
+ {
+ #
+ 'PRODUCTS.PARAVISADDONS.default.patches' : ['paraview-5.9_PARAVISADDONS.patch']
+ }
]
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 : 'OpenMP' # OpenMP # choose among: sequential / OpenMP / TBB switches
}
launch : {PYTHONIOENCODING:"UTF_8"} # alternative is to encode every accentued string with .encode('utf-8')
SALOME_trace : "local" # local/file:.../with_logger
boost : 'native'
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 : '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'
+ openVKL : '0.11.0'
openturns: '1.16'
- ospray : '1.8.4'
+ 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
planegcs : '0.18-3cb6890'
- pockets : 'native'
+ psutil : 'native'
Pygments : 'native'
pyparsing : 'native'
PyQt : 'native'
qt : 'native'
qwt : 'native'
requests : 'native'
+ rkCommon : '1.5.1'
root: '6.22.02'
scipy : 'native'
scotch : 'native'
six : 'native'
snowballstemmer : 'native'
Sphinx : 'native'
- sphinxcontrib_napoleon : 'native'
sphinxcontrib_websupport : 'native'
sphinxintl: 'native'
sphinx_rtd_theme : '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__ :
+[
+ {
+ #
+ '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'
+ }
+ {
+ #
+ __condition__ : "VARS.dist in ['UB20.04', 'CO8', 'FD32']"
+ 'PRODUCTS.ParaView.version_5_9_0.patches' : ['paraview.0003-ParaViewClient.patch',
+ 'paraview.0005-ParaView_find_cgns.patch',
+ 'paraview-0012-LATA_64BITS_IDS.patch',
+ 'ParaView-5.9.0-CATALYST_cmake.patch']
+ }
+ {
+ # On DB10, 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).
+ # What is more, ParaView 5.9 CMake procedure requires Qt 5.12 as minimum version (5.11 here).
+ # As this version is compliant too, let's force it as the new minimum needed version.
+ __condition__ : "VARS.dist in ['DB10']"
+ 'PRODUCTS.ParaView.version_5_9_0.patches' : ['paraview.0003-ParaViewClient.patch',
+ 'paraview.0005-ParaView_find_cgns.patch',
+ 'paraview-0012-LATA_64BITS_IDS.patch',
+ 'paraview-5.9_qt-minimum-version.patch',
+ 'paraview.0003-ParaViewClient_native.patch',
+ 'ParaView-5.9.0-CATALYST_cmake.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"
+ 'APPLICATION.products.cmake' : '3.12.1'
+ }
+]
boost : '1.67.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'
f2c : '1.0.0'
freeimage : '3.18.0'
freetype : '2.9.1'
-# gmsh : '4.1.4'
+ #gmsh : '4.1.4'
graphviz : '2.44.1'
hdf5 : '1.10.3'
-# homard_bin : '11.12'
+ #homard_bin : '11.12'
idna : '2.8'
imagesize : '1.1.0'
ispc : '1.10.0'
omniORB : '4.2.3'
omniORBpy : '4.2.3'
opencv : '3.2.0'
-# openturns: '1.16'
- ospray : '1.8.4'
+ openVKL: '0.11.0'
+ openturns: '1.16'
+ ospray : '2.4.0'
packaging : '19.0'
- ParaView : '5.8.0'
+ ParaView : '5.9.0'
perl : '5.28.1.1'
Pillow : '7.1.1'
planegcs : '0.18-3cb6890'
pthreads : '2.9.1'
Pygments : '2.4.2'
pyparsing : '2.4.0'
- PyQt : '5.9'
- PyQtChart : '5.9'
+ PyQt : '5.15.3'
+# PyQtChart : '5.9'
pyreadline : '2.1'
Python : '3.6.5'
pytz : '2019.1'
- qt : '5.9.1'
+ qt : '5.12.10'
qwt : '6.1.2'
requests : '2.22.0'
- root: '6.22.06'
+ rkCommon : '1.5.1'
ruby : '2.5.5-1'
scipy : '1.4.1'
setuptools : '41.0.1'
tbb : '2019_U8_win'
tcltk : '8.6.9'
urllib3 : '1.25.3'
-# URANIE : '4.5.0'
zlib : '1.2.5'
# SALOME MODULES :
__overwrite__ :
[
+ {
+ #
+ 'PRODUCTS.PARAVISADDONS.default.patches' : ['paraview-5.9_PARAVISADDONS.patch']
+ }
{
__condition__ : "APPLICATION.debug == 'yes'"
'APPLICATION.products.numpy' : '1.16.4-win-dbg'
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
+ VTK_SMP_IMPLEMENTATION_TYPE : OpenMP # OpenMP # choose among: sequential / OpenMP / TBB switches
}
launch : {PYTHONIOENCODING:"UTF_8", SALOME_MODULES_ORDER:"SHAPER:SHAPERSTUDY:GEOM:SMESH"}
SALOME_trace : "local" # local/file:.../with_logger
boost : '1.58.0'
CAS : {tag: 'CR750-SALOME-PATCH', section: 'version_V7_5_0'}
certifi : '2018.8.24'
- cgns : '3.3.1'
+ cgns : '4.1.1'
chardet : '3.0.4'
click : '6.7'
cmake : '3.12.1'
docutils : '0.12'
doxygen : '1.8.14'
eigen : '3.3.4'
- embree : '3.3.0'
+ embree : '3.12.2'
freeimage : '3.16.0'
freetype : '2.9.1'
gmsh : '4.1.4'
graphviz : '2.38.0'
hdf5 : '1.10.3'
- homard_bin : '11.12_hdf51103med410'
idna : '2.7'
imagesize : '1.0.0'
- ispc : '1.9.2'
+ ispc : '1.15.0'
Jinja2 : '2.7.3'
kiwisolver : '1.0.1'
lapack : '3.8.0'
omniORBpy : '4.2.2'
opencv : '3.2.0'
openssl : "native"
-# openturns: '1.16'
- ospray : '1.8.4'
+ openturns: '1.16'
+ openVKL: '0.11.0'
+ ospray : '2.4.0'
packaging : '17.1'
- ParaView : '5.8.0'
+ ParaView : '5.9.0'
petsc : '3.14.0'
Pillow : '7.1.1'
planegcs : '0.18-3cb6890'
psutil : '5.7.2'
Pygments : '2.0.2'
pyparsing : '2.0.3'
- PyQt : '5.9'
- PyQtChart : '5.9'
+ PyQt : '5.15.3'
+ #PyQtChart : '5.9'
pyreadline : '2.0'
Python : '3.6.5'
pytz : '2015.7'
- qt : '5.9.1'
+ qt : '5.12.10'
qwt : '6.1.2'
requests : '2.19.1'
+ rkCommon : '1.5.1'
root: '6.22.02'
scipy : '0.19.1'
scotch : '6.0.4'
setuptools : '38.4.0'
- sip : '4.19.3'
+ sip : '5.5.0'
six : '1.10.0'
snowballstemmer : '1.2.1'
Sphinx : '1.7.6'
sphinxintl: '0.9.10'
StaticMeshPlugin : '5.8.0'
swig : '3.0.12'
- tbb : 'native'
+ tbb : '2019_U8'
tcl : '8.6.0'
tk : '8.6.0'
urllib3 : '1.23'
-# URANIE : '4.5.0'
+ URANIE : '4.5.0'
# SALOME MODULES :
'CONFIGURATION'
'SALOME'
__overwrite__ :
[
{
- # GTK compilation issue
- __condition__ : "VARS.dist in ['CO6']"
- 'APPLICATION.products.opencv' : '2.4.13.5'
- 'APPLICATION.products.tbb' : '4.4'
- 'APPLICATION.products.llvm' : '3.9.1-clang'
- 'APPLICATION.products.mesa' : '13.0.6'
- 'PRODUCTS.embree.default.patches' : ['embree-3.5.2-centos6.patch']
- }
-
- {
- # tbb as a mandatory native product since SMESH with tbb, not installed on DB8 (temporary)
- __condition__ : "VARS.dist in ['DB08']"
- 'APPLICATION.products.tbb' : '4.4'
- }
-
- {
- #
- __condition__ : "VARS.dist in ['FD26']"
- 'APPLICATION.products.tbb' : '2017-7'
- 'APPLICATION.products.embree' : '3.5.2'
- }
-
- {
- #
- __condition__ : "VARS.dist in ['UB20.04']"
- 'PRODUCTS.qt.version_5_9_1.patches' : ['qt-5.9.1-UB20-FD32-socketcanbackend.patch']
- }
-
- {
- # Build Fedora 30 with less permissive compilation flags (see spns #18962)
- __condition__ : "VARS.dist in ['FD30']"
- 'PRODUCTS.LIBBATCH.default.cmake_options' : "-DLIBBATCH_DEBUG_WARNINGS=ON -DSWIG_EXECUTABLE=${SWIG_ROOT_DIR}/bin/swig"
- 'PRODUCTS.CONFIGURATION.default.patches' : ['CONFIGURATION-SALOME-DEBUG-WARNINGS.patch']
- }
-
- {
- __condition__ : "VARS.dist in ['FD32']"
- 'APPLICATION.products.scipy' : '1.5.2' # gcc https://github.com/scipy/scipy/issues/11611 - either patch numpy to include -fallow-argument-mismatch or move to that version
- # see https://bugs.gentoo.org/708730
- 'PRODUCTS.llvm.version_8_0_1_clang.patches' : ['llvm-8.0.1-clang-FD32.patch']
- 'PRODUCTS.qt.version_5_9_1.patches' : ['qt-5.9.1-UB20-FD32-socketcanbackend.patch', 'qt-5.9.1-mapbox-FD32.patch']
- 'PRODUCTS.mesa.version_19_0_8.patches' : ['mesa-19.0.8-debug_symbol.patch']
- }
-
- {
- __condition__ : "VARS.dist in ['CO7']"
- 'APPLICATION.products.tbb' : '2019_U8'
- }
-
- {
- __condition__ : "VARS.dist in ['CO7'] and APPLICATION.environ.build.VTK_SMP_IMPLEMENTATION_TYPE == 'OpenMP'"
- 'PRODUCTS.ParaView.version_5_8_0.patches' : ['paraview.0003-ParaViewClient.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.0009-ParaView_volume_mapper.patch',
- 'paraview.0011-vtkSMPSelection.patch',
- 'pv_coincident.patch',
- 'paraview-0012-LATA_64BITS_IDS.patch'
- ]
- }
-
- {
- __condition__ : "VARS.dist in ['CO7'] and APPLICATION.environ.build.VTK_SMP_IMPLEMENTATION_TYPE == 'TBB'"
- 'APPLICATION.products.tbb' : '2019_U8'
- }
-
- {
- # Adapt Paraview CMake files to be compliant with recent distributions
- __condition__ : "VARS.dist in ['FD30', 'FD32', 'CO8']"
- 'PRODUCTS.ParaView.version_5_8_0.patches' : ['paraview.0004-ParaView_hdf5.patch',
- 'paraview.0005-ParaView_find_cgns.patch',
- 'paraview.0006-ParaView_find_libxml2.patch',
- 'paraview.0007-ParaView_find_freetype.patch',
- 'paraview.0009-ParaView_volume_mapper.patch',
- 'paraview.0010-ParaViewClient.patch',
- 'paraview.0010-ParaView_find_python.patch',
- 'pv_coincident.patch',
- 'paraview-0012-LATA_64BITS_IDS.patch'
- ]
+ #
+ 'PRODUCTS.PARAVISADDONS.default.patches' : ['paraview-5.9_PARAVISADDONS.patch']
}
]
"setuptools",
"Pygments",
"pytz",
- "LIBBATCH"
+ "LIBBATCH",
+ "psutil"
]
build_depend : ["cmake", "swig", "doxygen", "cppunit"]
source_dir : $APPLICATION.workdir + $VARS.sep + 'SOURCES' + $VARS.sep + $name
"Pygments",
"pytz",
"LIBBATCH",
- "graphviz"
+ "graphviz",
+ "psutil"
]
build_depend : ["cmake", "swig", "doxygen", "cppunit"]
}
"pytz",
"cppunit",
"openmpi",
- "LIBBATCH"
+ "LIBBATCH",
+ "psutil"
]
}
rpm : ["python3-qt5"]
rpm_dev : ["python3-qt5-devel"]
apt : ["python3-pyqt5"]
- apt_dev : ["pyqt5-dev"]
+ apt_dev : ["pyqt5-dev", "pyqt5-dev-tools"]
}
environ :
{
}
}
+version_5_15_3 :
+{
+ compil_script : "PyQt-5.15" + $VARS.scriptExtension
+}
+
+version_5_12_3 :
+{
+ name : "PyQt"
+ compil_script : "PyQt-5.12" + $VARS.scriptExtension
+}
+
+
version_5_11_3 :
{
compil_script : "PyQt-5.11" + $VARS.scriptExtension
{
rpm : ["boost"]
rpm_dev : ["boost-devel"]
- apt : ["libboost-regex", "libboost-thread" , "libboost-serialization",
- "libboost-chrono", "libboost-filesystem", "libboost-system",
- "libboost-date-time", "libboost-graph"]
- apt_dev : ["libboost-regex-dev", "libboost-thread-dev", "libboost-serialization-dev",
- "libboost-chrono-dev", "libboost-filesystem-dev", "libboost-system-dev",
- "libboost-date-time-dev", "libboost-graph-dev"]
+ apt : []
+ apt_dev : ["libboost-all-dev"]
}
environ :
{
{
rpm : ["cgnslib"]
rpm_dev : ["cgnslib-devel"]
- apt : ["libcgns3"]
+ apt : []
apt_dev : ["libcgns-dev"]
}
environ :
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=OFF"
-CMAKE_OPTIONS="${CMAKE_OPTIONS} -DCATALYST_BUILD_STUB_IMPLEMENTATION:BOOL=OFF"
+CMAKE_OPTIONS="${CMAKE_OPTIONS} -DPARAVIEW_USE_CATALYST:BOOL=ON"
+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"
-
### 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"
--- /dev/null
+#!/bin/bash
+
+echo "##########################################################################"
+echo "PyQt" $VERSION
+echo "##########################################################################"
+
+
+
+python_name=python$PYTHON_VERSION
+
+# OP 01/08/2017 Artifact 8859 : test compilation PyQt 5.9
+# On fait tout dans les sources
+#CURRENT_DIR=`pwd`
+cd $SOURCE_DIR
+if [ $? -ne 0 ]
+then
+ echo "ERROR on $SOURCE_DIR access"
+ exit 1
+fi
+
+
+echo
+echo "*** configure.py --confirm-license --no-designer-plugin --verbose --bindir=${PRODUCT_INSTALL}/bin --destdir=${PRODUCT_INSTALL}/lib/$python_name/site-packages --sipdir=${SIP_ROOT_DIR} --disable=QtNetwork --disable=QtWebSockets"
+$PYTHONBIN ./configure.py --confirm-license --no-designer-plugin --verbose \
+ --bindir=${PRODUCT_INSTALL}/bin \
+ --destdir=${PRODUCT_INSTALL}/lib/$python_name/site-packages \
+ --sipdir=${SIP_ROOT_DIR}/sip \
+ --disable=QtNetwork --disable=QtWebSockets 2>&1
+
+if [ $? -ne 0 ]
+then
+ echo "ERROR on configure"
+# OP 01/08/2017 Artifact 8859 : test compilation PyQt 5.9
+# On fait tout dans les sources
+# exit 1
+# cd $CURRENT_DIR
+ exit 2
+fi
+
+echo
+echo "*** make" $MAKE_OPTIONS
+make $MAKE_OPTIONS
+if [ $? -ne 0 ]
+then
+ echo "ERROR on make"
+# OP 01/08/2017 Artifact 8859 : test compilation PyQt 5.9
+# On fait tout dans les sources
+# exit 2
+# cd $CURRENT_DIR
+ exit 3
+fi
+
+echo
+echo "*** make install"
+make install
+if [ $? -ne 0 ]
+then
+ echo "ERROR on make install"
+# OP 01/08/2017 Artifact 8859 : test compilation PyQt 5.9
+# On fait tout dans les sources
+# exit 3
+# cd $CURRENT_DIR
+ exit 4
+fi
+
+# OP 01/08/2017 Artifact 8859 : test compilation PyQt 5.9
+# Ajout du make clean
+echo
+echo "*** make clean"
+make clean
+if [ $? -ne 0 ]
+then
+ echo "ERROR on make clean"
+# cd $CURRENT_DIR
+ exit 5
+fi
+
+
+echo
+echo "########## END"
+
+exit 0
+
--- /dev/null
+#!/bin/bash
+
+echo "##########################################################################"
+echo "PyQt" $VERSION
+echo "##########################################################################"
+
+
+
+python_name=python$PYTHON_VERSION
+
+# OP 01/08/2017 Artifact 8859 : test compilation PyQt 5.9
+# On fait tout dans les sources
+#CURRENT_DIR=`pwd`
+cd $SOURCE_DIR
+if [ $? -ne 0 ]
+then
+ echo "ERROR on $SOURCE_DIR access"
+ exit 1
+fi
+
+
+echo
+echo "*** configure.py --confirm-license --no-designer-plugin --verbose --bindir=${PRODUCT_INSTALL}/bin --destdir=${PRODUCT_INSTALL}/lib/$python_name/site-packages --sipdir=${SIP_ROOT_DIR} --disable=QtNetwork --disable=QtWebSockets"
+$PYTHONBIN ./configure.py --confirm-license --no-designer-plugin --verbose \
+ --bindir=${PRODUCT_INSTALL}/bin \
+ --destdir=${PRODUCT_INSTALL}/lib/$python_name/site-packages \
+ --sipdir=${SIP_ROOT_DIR} \
+ --disable=QtNetwork --disable=QtWebSockets 2>&1
+# --disable=QtNetwork --disable=QtWebSockets --disable=QtWebKit --disable=QtWebKitWidgets --disable=QAxContainer --disable=QtMacExtras --disable=QtWinExtras --disable=QtX11Extras --disable=Enginio 2>&1
+
+if [ $? -ne 0 ]
+then
+ echo "ERROR on configure"
+# OP 01/08/2017 Artifact 8859 : test compilation PyQt 5.9
+# On fait tout dans les sources
+# exit 1
+# cd $CURRENT_DIR
+ exit 2
+fi
+
+echo
+echo "*** make" $MAKE_OPTIONS
+make $MAKE_OPTIONS
+if [ $? -ne 0 ]
+then
+ echo "ERROR on make"
+# OP 01/08/2017 Artifact 8859 : test compilation PyQt 5.9
+# On fait tout dans les sources
+# exit 2
+# cd $CURRENT_DIR
+ exit 3
+fi
+
+echo
+echo "*** make install"
+make install
+if [ $? -ne 0 ]
+then
+ echo "ERROR on make install"
+# OP 01/08/2017 Artifact 8859 : test compilation PyQt 5.9
+# On fait tout dans les sources
+# exit 3
+# cd $CURRENT_DIR
+ exit 4
+fi
+
+# OP 01/08/2017 Artifact 8859 : test compilation PyQt 5.9
+# Ajout du make clean
+echo
+echo "*** make clean"
+make clean
+if [ $? -ne 0 ]
+then
+ echo "ERROR on make clean"
+# cd $CURRENT_DIR
+ exit 5
+fi
+
+# Issue with GUI - TO BE FIXED
+if [ -n "$SIP_ROOT_DIR" ]
+then
+ cp -r $SIP_ROOT_DIR $PRODUCT_INSTALL
+else
+ echo "FATAL: Please set SIP_ROOT_DIR environment variable"
+ exit 6
+fi
+
+echo
+echo "########## END"
+
+exit 0
+
BFLAG="-m64"
OLEVEL="-O2"
-if [ "${TCLHOME}" == '/usr' ]
+if [ "${TCLHOME}" != '/usr' ]
then
- TCL_LIB_DIR=${TCLHOME}/lib64
-else
- TCL_LIB_DIR=${TCLHOME}/lib
+ TCL_TK_OPTIONS="--with-tcl=${TCLHOME}/lib --with-tk=${TCLHOME}/lib --with-tclinclude=${TCLHOME}/include"
fi
echo ./configure --prefix=${PRODUCT_INSTALL} \
--with-occ=${CASROOT} \
- --with-tcl=${TCL_LIB_DIR} \
- --with-tk=${TCL_LIB_DIR} \
--disable-openmp \
- --with-tclinclude=${TCLHOME}/include \
+ ${TCL_TK_OPTIONS} \
CXXFLAGS="-I${CASROOT}/include/opencascade ${OLEVEL} ${BFLAG} -std=c++0x"
./configure --prefix=${PRODUCT_INSTALL} \
--with-occ=${CASROOT} \
- --with-tcl=${TCL_LIB_DIR} \
- --with-tk=${TCL_LIB_DIR} \
--disable-openmp \
- --with-tclinclude=${TCLHOME}/include \
+ ${TCL_TK_OPTIONS} \
CXXFLAGS="-I${CASROOT}/include/opencascade ${OLEVEL} ${BFLAG} -std=c++0x" #-std=gnu++11" #-std=c++11 -std=c++0x"
-
+
if [ $? -ne 0 ]
then
echo "error on configure"
# For -qt-harfbuzz option, see spns #9694
echo
-echo "*** $SOURCE_DIR/configure -prefix $PRODUCT_INSTALL $BUILD_TYPE -opensource -nomake tests -nomake examples -no-rpath -verbose -no-separate-debug-info -confirm-license -qt-libpng -qt-xcb -no-eglfs -dbus-runtime -skip qtwebengine -skip wayland -skip qtgamepad -system-freetype -qt-harfbuzz -no-openssl -no-glib"
+echo "*** $SOURCE_DIR/configure -prefix $PRODUCT_INSTALL $BUILD_TYPE -opensource -nomake tests -nomake examples -no-rpath -verbose -no-separate-debug-info -confirm-license -qt-libpng -qt-xcb -no-eglfs -dbus-runtime -skip qtwebengine -skip wayland -skip qtgamepad -system-freetype -qt-harfbuzz -no-openssl -no-glib -no-jasper"
$SOURCE_DIR/configure -prefix $PRODUCT_INSTALL $BUILD_TYPE -opensource -nomake tests -nomake examples -no-rpath \
-verbose -no-separate-debug-info -confirm-license -qt-libpng -qt-xcb -no-eglfs -dbus-runtime -skip qtwebengine \
-skip wayland -skip qtgamepad -system-freetype -qt-harfbuzz \
- -no-openssl -no-glib
+ -no-openssl -no-glib -no-jasper
if [ $? -ne 0 ]
then
--- /dev/null
+#!/bin/bash
+
+echo "##########################################################################"
+echo SIP + PyQt5_sip $VERSION
+echo "##########################################################################"
+
+
+echo "*** build in SOURCE directory"
+cd $SOURCE_DIR/sip-5.5.0
+
+# we don't install in python directory -> modify environment as described in INSTALL file
+mkdir -p $PRODUCT_INSTALL/lib/python${PYTHON_VERSION:0:3}/site-packages
+export PATH=$(pwd)/bin:$PATH
+export PYTHONPATH=$(pwd):$PYTHONPATH
+export PYTHONPATH=${PRODUCT_INSTALL}/lib/python${PYTHON_VERSION:0:3}/site-packages:$PYTHONPATH
+
+echo
+echo "*** build with $PYTHONBIN"
+$PYTHONBIN setup.py build
+if [ $? -ne 0 ]
+then
+ echo "ERROR on build"
+ exit 2
+fi
+
+echo
+echo "*** install with $PYTHONBIN"
+$PYTHONBIN setup.py install --prefix=$PRODUCT_INSTALL
+if [ $? -ne 0 ]
+then
+ echo "ERROR on install"
+ exit 3
+fi
+
+cd $SOURCE_DIR/PyQt5_sip-12.8.1
+
+echo
+echo "*** build with $PYTHONBIN"
+$PYTHONBIN setup.py build
+if [ $? -ne 0 ]
+then
+ echo "ERROR on build"
+ exit 2
+fi
+
+echo
+echo "*** install with $PYTHONBIN"
+$PYTHONBIN setup.py install --prefix=$PRODUCT_INSTALL
+if [ $? -ne 0 ]
+then
+ echo "ERROR on install"
+ exit 3
+fi
+
+mkdir $PRODUCT_INSTALL/include
+cp *.h $PRODUCT_INSTALL/include
+
+cd $PRODUCT_INSTALL/bin
+ln -sf sip5 sip
+
+echo
+echo "########## END"
{
rpm : ["cppunit"]
rpm_dev : ["cppunit-devel"]
- apt : ["libcppunit"]
+ apt : []
apt_dev : ["libcppunit-dev"]
}
environ :
env.prepend('LD_LIBRARY_PATH', os.path.join(prereq_dir, 'lib'))
def set_nativ_env(env):
+
+ # Adapt Qt libraries dir according to the current distribution (generic -> Ubuntu)
+ if any(distribution in platform.platform() for distribution in ["debian", "generic"]) :
+ qt_lib_dir='/usr/lib/x86_64-linux-gnu'
+ else :
+ qt_lib_dir='/usr/lib64'
+
env.set('QT5_ROOT_DIR', '/usr')
- env.set('Qt5Core_DIR', '/usr/lib64/cmake/Qt5Core')
- env.set('Qt5Gui_DIR', '/usr/lib64/cmake/Qt5Gui')
- env.set('Qt5Widgets_DIR', '/usr/lib64/cmake/Qt5Widgets')
- env.set('Qt5Network_DIR', '/usr/lib64/cmake/Qt5Network')
- env.set('Qt5Xml_DIR', '/usr/lib64/cmake/Qt5Xml')
- env.set('Qt5OpenGL_DIR', '/usr/lib64/cmake/Qt5OpenGL')
- env.set('Qt5PrintSupport_DIR', '/usr/lib64/cmake/Qt5PrintSupport')
- env.set('Qt5Help_DIR', '/usr/lib64/cmake/Qt5Help')
- env.set('Qt5Test_DIR', '/usr/lib64/cmake/Qt5Test')
- env.set('Qt5X11Extras_DIR', '/usr/lib64/cmake/Qt5X11Extras')
+ env.set('Qt5Core_DIR', os.path.join(qt_lib_dir, 'cmake/Qt5Core'))
+ env.set('Qt5Gui_DIR', os.path.join(qt_lib_dir, 'cmake/Qt5Gui'))
+ env.set('Qt5Widgets_DIR', os.path.join(qt_lib_dir, 'cmake/Qt5Widgets'))
+ env.set('Qt5Network_DIR', os.path.join(qt_lib_dir, 'cmake/Qt5Network'))
+ env.set('Qt5Xml_DIR', os.path.join(qt_lib_dir, 'cmake/Qt5Xml'))
+ env.set('Qt5OpenGL_DIR', os.path.join(qt_lib_dir, 'cmake/Qt5OpenGL'))
+ env.set('Qt5PrintSupport_DIR', os.path.join(qt_lib_dir, 'cmake/Qt5PrintSupport'))
+ env.set('Qt5Help_DIR', os.path.join(qt_lib_dir, 'cmake/Qt5Help'))
+ env.set('Qt5Test_DIR', os.path.join(qt_lib_dir, 'cmake/Qt5Test'))
+ env.set('Qt5X11Extras_DIR', os.path.join(qt_lib_dir, 'cmake/Qt5X11Extras'))
{
rpm : ["freeimage"]
rpm_dev : ["freeimage-devel"]
- apt : ["libfreeimage"]
+ apt : ["libfreeimage3"]
apt_dev : ["libfreeimage-dev"]
}
patches : []
{
rpm : ["freetype"]
rpm_dev : ["freetype-devel"]
- apt : ["libfreetype"]
+ apt : ["libfreetype6"]
apt_dev : ["libfreetype6-dev"]
}
environ :
{
name : "openVKL"
build_source : "cmake"
- cmake_options : "-DBUILD_TESTING=OFF -DCMAKE_INSTALL_LIBDIR=lib"
+ cmake_options : "-DBUILD_TESTING=OFF -DCMAKE_INSTALL_LIBDIR=lib -DBUILD_EXAMPLES=OFF"
get_source : "archive"
environ :
{
env_script : $name + ".py"
}
- depend : ['Python', 'tbb','glfw', 'ispc', 'rkCommon', 'embree']
+ depend : ['Python', 'tbb', 'ispc', 'rkCommon', 'embree']
build_depend : ['cmake']
source_dir : $APPLICATION.workdir + $VARS.sep + 'SOURCES' + $VARS.sep + $name
build_dir : $APPLICATION.workdir + $VARS.sep + 'BUILD' + $VARS.sep + $name
{
rpm : ["opencv"]
rpm_dev : ["opencv-devel"]
- apt : ["libopencv"]
+ apt : ["python3-opencv"]
apt_dev : ["libopencv-dev"]
}
environ :
---- ParaView_ref/ThirdParty/catalyst/vtkcatalyst/catalyst/CMakeLists.txt 2021-02-12 16:35:40.957930618 +0100
-+++ ParaView/ThirdParty/catalyst/vtkcatalyst/catalyst/CMakeLists.txt 2021-02-12 16:35:50.500219714 +0100
+diff -Naur ParaView-5.9.0_ref/ThirdParty/catalyst/vtkcatalyst/catalyst/cmake/catalyst-config.cmake.in ParaView-5.9.0/ThirdParty/catalyst/vtkcatalyst/catalyst/cmake/catalyst-config.cmake.in
+--- ParaView-5.9.0_ref/ThirdParty/catalyst/vtkcatalyst/catalyst/cmake/catalyst-config.cmake.in 2021-02-04 15:22:02.000000000 +0100
++++ ParaView-5.9.0/ThirdParty/catalyst/vtkcatalyst/catalyst/cmake/catalyst-config.cmake.in 2021-03-01 15:51:58.110940810 +0100
+@@ -1,6 +1,6 @@
+ # Catalyst Package config file.
+ cmake_policy(PUSH)
+-cmake_policy(VERSION 3.13)
++cmake_policy(VERSION 3.12)
+
+ set(CATALYST_VERSION "@CATALYST_VERSION@")
+ set(CATALYST_ABI_VERSION "@CATALYST_ABI_VERSION@")
+
+diff -Naur ParaView-5.9.0_ref/ThirdParty/catalyst/vtkcatalyst/catalyst/CMakeLists.txt ParaView-5.9.0/ThirdParty/catalyst/vtkcatalyst/catalyst/CMakeLists.txt
+--- ParaView-5.9.0_ref/ThirdParty/catalyst/vtkcatalyst/catalyst/CMakeLists.txt 2021-02-04 15:22:02.000000000 +0100
++++ ParaView-5.9.0/ThirdParty/catalyst/vtkcatalyst/catalyst/CMakeLists.txt 2021-03-01 15:56:02.640910857 +0100
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.13...3.16 FATAL_ERROR)
+cmake_minimum_required(VERSION 3.12...3.16 FATAL_ERROR)
--- /dev/null
+diff --git a/src/ElectromagnetismRotation/plugin/ElectromagnetismRotationIO/vtkElectromagnetismRotation.cxx b/src/ElectromagnetismRotation/plugin/ElectromagnetismRotationIO/vtkElectromagnetismRotation.cxx
+index dfe3af6..8107cb6 100644
+--- a/src/ElectromagnetismRotation/plugin/ElectromagnetismRotationIO/vtkElectromagnetismRotation.cxx
++++ b/src/ElectromagnetismRotation/plugin/ElectromagnetismRotationIO/vtkElectromagnetismRotation.cxx
+@@ -26,7 +26,7 @@
+ #include "VTKMEDTraits.hxx"
+
+ #include "vtkAdjacentVertexIterator.h"
+-#include "vtkDataArrayTemplate.h"
++#include "vtkAOSDataArrayTemplate.h"
+ #include "vtkIntArray.h"
+ #include "vtkLongArray.h"
+ #ifdef WIN32
+@@ -210,7 +210,7 @@ vtkDataSet *FilterFamilies(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/ExtractThreeD/plugin/ExtractThreeDModule/vtkExtractThreeD.cxx b/src/ExtractThreeD/plugin/ExtractThreeDModule/vtkExtractThreeD.cxx
+index 208c6f3..5043cbc 100644
+--- a/src/ExtractThreeD/plugin/ExtractThreeDModule/vtkExtractThreeD.cxx
++++ b/src/ExtractThreeD/plugin/ExtractThreeDModule/vtkExtractThreeD.cxx
+@@ -30,7 +30,7 @@
+ #include <vtkCellData.h>
+ #include <vtkCharArray.h>
+ #include <vtkDataArraySelection.h>
+-#include <vtkDataArrayTemplate.h>
++#include <vtkAOSDataArrayTemplate.h>
+ #include <vtkDataObjectTreeIterator.h>
+ #include <vtkDataSet.h>
+ #include <vtkDataSetAttributes.h>
+@@ -156,7 +156,7 @@ int vtkExtractThreeD::RequestInformation(vtkInformation *request, vtkInformation
+
+ vtkDataSet *FilterFamilies(vtkDataSet *input, const std::vector<int> &idsToKeep)
+ {
+- 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/ZJFilter/plugin/ZJFilterModule/vtkZJFilter.cxx b/src/ZJFilter/plugin/ZJFilterModule/vtkZJFilter.cxx
+index 803049e..e257e58 100644
+--- a/src/ZJFilter/plugin/ZJFilterModule/vtkZJFilter.cxx
++++ b/src/ZJFilter/plugin/ZJFilterModule/vtkZJFilter.cxx
+@@ -29,7 +29,7 @@
+ #include <vtkCharArray.h>
+ #include <vtkCompositeDataToUnstructuredGridFilter.h>
+ #include <vtkDataArraySelection.h>
+-#include <vtkDataArrayTemplate.h>
++#include <vtkAOSDataArrayTemplate.h>
+ #include <vtkDataObjectTreeIterator.h>
+ #include <vtkDataSet.h>
+ #include <vtkDataSetAttributes.h>
+@@ -363,7 +363,7 @@ vtkDataSet* FilterFamilies(vtkZJFilter* zeBoss, vtkDataSet* input, const std::se
+ bool catchAll, catchSmth;
+ vtkNew<vtkThreshold> thres;
+ thres->AddObserver(vtkCommand::ProgressEvent, zeBoss->InternalProgressObserver);
+- constexpr int VTK_DATA_ARRAY_DELETE = vtkDataArrayTemplate<double>::VTK_DATA_ARRAY_DELETE;
++ constexpr int VTK_DATA_ARRAY_DELETE = vtkAOSDataArrayTemplate<double>::VTK_DATA_ARRAY_DELETE;
+ constexpr char ZE_SELECTION_ARR_NAME[] = "@@ZeSelection@@";
+ constexpr char arrNameOfFamilyField[] = "FamilyIdCell";
+ constexpr char associationForThreshold[] = "vtkDataObject::FIELD_ASSOCIATION_CELLS";
--- /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)
--- /dev/null
+--- ParaView/CMake/ParaViewClient.cmake 2020-12-21 19:28:36.023465845 +0100
++++ ParaView.new/CMake/ParaViewClient.cmake 2020-12-21 19:30:17.073254132 +0100
+@@ -516,6 +516,7 @@
+ NAMES xmlpatterns-qt5 xmlpatterns
+ HINTS "${Qt5_DIR}/../../../bin"
+ "${Qt5_DIR}/../../../libexec/qt5/bin"
++ "${Qt5_DIR}/../../qt5/bin"
+ NO_CMAKE_PATH
+ DOC "Path to xmlpatterns")
+ mark_as_advanced(qt_xmlpatterns_executable)
{
rpm : []
rpm_dev : ["qt5-devel"]
- apt : ["build-essential"]
- apt_dev : ["libgl1-mesa-dev"]
+ apt : []
+ apt_dev : ["qttools5-dev", "libqt5svg5-dev", "libqt5x11extras5-dev", "qtxmlpatterns5-dev-tools"]
}
environ :
{
check_install : []
}
+version_5_15_2 :
+{
+ compil_script : "qt-5.15.2.sh"
+ depend : ["freetype", 'llvm']
+}
+
version_5_12_10 :
{
compil_script : "qt-5.12.10.sh"
{
rpm : ["qwt-qt5"]
rpm_dev : ["qwt-qt5-devel"]
- apt : ["libqwt-qt5"]
+ apt : ["libqwt-qt5-6"]
apt_dev : ["libqwt-qt5-dev"]
}
environ :
{
rpm : ["scotch"]
rpm_dev : ["scotch-devel"]
- apt : ["libscotch"]
+ apt : []
apt_dev : ["libscotch-dev"]
}
environ :
version_5_5_0 :
{
- properties:
- {
- incremental : "yes"
- pip : "yes"
- }
-}
\ No newline at end of file
+ compil_script : 'sip-5.5.0.sh'
+ archive_info : {archive_name : "sip-5.5.0-PyQt5_sip-12.8.1.tar.gz"}
+}
+
+version_4_19_24 :
+{
+ compil_script : 'sip.sh'
+# archive_info : {archive_name : "sip-4.19.24_PyQt5-12.8.1.tar.gz"}
+}
{
rpm : ["python3-snowballstemmer"]
rpm_dev : []
- apt : ["python3-snowballstemmer"]
+ apt : ["python3-stemmer"]
apt_dev : []
}
environ :
build_source : "script"
compil_script : 'pip_install' + $VARS.scriptExtension
get_source : "archive"
+ system_info :
+ {
+ rpm : ["python3-sphinx-intl"]
+ rpm_dev : []
+ apt : ["sphinx-intl"]
+ apt_dev : []
+ }
environ :
{
env_script : "sphinxintl.py"
{
rpm : ["tbb"]
rpm_dev : ["tbb-devel"]
- apt : ["libtbb"]
+ apt : ["libtbb2"]
apt_dev : ["libtbb-dev"]
}
environ :
