From 59546ac80d9271d3527720e3003bc9d95990cccb Mon Sep 17 00:00:00 2001 From: Nabil Ghodbane Date: Fri, 4 Mar 2022 16:38:45 +0100 Subject: [PATCH] Switch on GDAL support ParaView... --- products/ParaView.pyconf | 2 +- products/compil_scripts/ParaView-5.9.0.sh | 193 +++++++++++----------- products/env_scripts/CAS.py | 2 - products/env_scripts/ParaView.py | 2 + 4 files changed, 104 insertions(+), 95 deletions(-) diff --git a/products/ParaView.pyconf b/products/ParaView.pyconf index b3d83ae..030a3e8 100755 --- a/products/ParaView.pyconf +++ b/products/ParaView.pyconf @@ -151,7 +151,7 @@ version_5_9_1_MPI : version_5_9_0 : { - opt_depend : ['openmpi', 'ospray','tbb', 'openturns'] + opt_depend : ['openmpi', 'ospray','tbb', 'openturns', 'gdal'] compil_script : 'ParaView-5.9.0.sh' archive_info : {archive_name : "ParaView-5.9.0-lata.tar.gz"} # two other LATA patches already included in archive diff --git a/products/compil_scripts/ParaView-5.9.0.sh b/products/compil_scripts/ParaView-5.9.0.sh index 67e6c1d..7cd28d7 100755 --- a/products/compil_scripts/ParaView-5.9.0.sh +++ b/products/compil_scripts/ParaView-5.9.0.sh @@ -10,26 +10,26 @@ PVLIBVERSION=`echo ${VERSION} | awk -F. '{printf("%d.%d",$1,$2)}'` CMAKE_OPTIONS="" ### common compiler and install settings -CMAKE_OPTIONS="${CMAKE_OPTIONS} -DCMAKE_INSTALL_PREFIX:STRING=${PRODUCT_INSTALL}" -CMAKE_OPTIONS="${CMAKE_OPTIONS} -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON" +CMAKE_OPTIONS+=" -DCMAKE_INSTALL_PREFIX:STRING=${PRODUCT_INSTALL}" +CMAKE_OPTIONS+=" -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON" if [ -n "$SAT_DEBUG" ] then - CMAKE_OPTIONS="${CMAKE_OPTIONS} -DCMAKE_BUILD_TYPE:STRING=Debug" + CMAKE_OPTIONS+=" -DCMAKE_BUILD_TYPE:STRING=Debug" else - CMAKE_OPTIONS="${CMAKE_OPTIONS} -DCMAKE_BUILD_TYPE:STRING=Release" + CMAKE_OPTIONS+=" -DCMAKE_BUILD_TYPE:STRING=Release" fi -CMAKE_OPTIONS="${CMAKE_OPTIONS} -DCMAKE_CXX_FLAGS:STRING=-m64" -CMAKE_OPTIONS="${CMAKE_OPTIONS} -DCMAKE_C_FLAGS:STRING=-m64" +CMAKE_OPTIONS+=" -DCMAKE_CXX_FLAGS:STRING=-m64" +CMAKE_OPTIONS+=" -DCMAKE_C_FLAGS:STRING=-m64" ### common ParaView settings -CMAKE_OPTIONS="${CMAKE_OPTIONS} -DPARAVIEW_BUILD_SHARED_LIBS:BOOL=ON" -CMAKE_OPTIONS="${CMAKE_OPTIONS} -DCMAKE_INSTALL_LIBDIR:STRING=lib" -CMAKE_OPTIONS="${CMAKE_OPTIONS} -DBUILD_TESTING:BOOL=OFF" -CMAKE_OPTIONS="${CMAKE_OPTIONS} -DPARAVIEW_INSTALL_DEVELOPMENT_FILES:BOOL=ON" +CMAKE_OPTIONS+=" -DPARAVIEW_BUILD_SHARED_LIBS:BOOL=ON" +CMAKE_OPTIONS+=" -DCMAKE_INSTALL_LIBDIR:STRING=lib" +CMAKE_OPTIONS+=" -DBUILD_TESTING:BOOL=OFF" +CMAKE_OPTIONS+=" -DPARAVIEW_INSTALL_DEVELOPMENT_FILES:BOOL=ON" ### OpenGL settings -CMAKE_OPTIONS="${CMAKE_OPTIONS} -DOpenGL_GL_PREFERENCE:STRING=LEGACY" -CMAKE_OPTIONS="${CMAKE_OPTIONS} -DCATALYST_BUILD_STUB_IMPLEMENTATION:BOOL=ON" +CMAKE_OPTIONS+=" -DOpenGL_GL_PREFERENCE:STRING=LEGACY" +CMAKE_OPTIONS+=" -DCATALYST_BUILD_STUB_IMPLEMENTATION:BOOL=ON" ### spns #20550 - Headless mode if [ -n "$PARAVIEW_HEADLESS_MODE" ] then @@ -47,7 +47,7 @@ then esac if [ $EGL_FOUND == "true" ]; then echo "WARNING: Building with headless mode support..." - CMAKE_OPTIONS="${CMAKE_OPTIONS} -DVTK_OPENGL_HAS_EGL:BOOL=ON" + CMAKE_OPTIONS+=" -DVTK_OPENGL_HAS_EGL:BOOL=ON" else echo "FATAL: Headless mode cannot be set on node $LINUX_DISTRIBUTION! Please expand the PARAVIEW_HEADLESS_MODE section in script: $0" exit 1 @@ -57,175 +57,175 @@ fi ### Ray-tracing settings if [ -n "$OSPRAY_ROOT_DIR" ] then - CMAKE_OPTIONS="${CMAKE_OPTIONS} -DPARAVIEW_ENABLE_RAYTRACING:BOOL=ON" - CMAKE_OPTIONS="${CMAKE_OPTIONS} -DVTK_ENABLE_OSPRAY:BOOL=ON" - CMAKE_OPTIONS="${CMAKE_OPTIONS} -Dospray_DIR:PATH=${OSPRAY_ROOT_DIR}/lib/cmake/ospray-${OSPRAY_VERSION}" - CMAKE_OPTIONS="${CMAKE_OPTIONS} -Dembree_DIR:PATH=${EMBREE_ROOT_DIR}/lib/cmake/embree-${EMBREE_VERSION}" + CMAKE_OPTIONS+=" -DPARAVIEW_ENABLE_RAYTRACING:BOOL=ON" + CMAKE_OPTIONS+=" -DVTK_ENABLE_OSPRAY:BOOL=ON" + CMAKE_OPTIONS+=" -Dospray_DIR:PATH=${OSPRAY_ROOT_DIR}/lib/cmake/ospray-${OSPRAY_VERSION}" + CMAKE_OPTIONS+=" -Dembree_DIR:PATH=${EMBREE_ROOT_DIR}/lib/cmake/embree-${EMBREE_VERSION}" else echo "WARNING: Paraview will be built without OSPRAY support!" - CMAKE_OPTIONS="${CMAKE_OPTIONS} -DPARAVIEW_ENABLE_RAYTRACING:BOOL=OFF" - CMAKE_OPTIONS="${CMAKE_OPTIONS} -DPARAVIEW_ENABLE_OSPRAY:BOOL=OFF" + CMAKE_OPTIONS+=" -DPARAVIEW_ENABLE_RAYTRACING:BOOL=OFF" + CMAKE_OPTIONS+=" -DPARAVIEW_ENABLE_OSPRAY:BOOL=OFF" fi ### VTK general settings if [ -n "$SALOME_USE_64BIT_IDS" ] then echo "WARNING: user requested VTK 64 bits encoding..." - CMAKE_OPTIONS="${CMAKE_OPTIONS} -DVTK_USE_64BIT_IDS:BOOL=ON" + CMAKE_OPTIONS+=" -DVTK_USE_64BIT_IDS:BOOL=ON" else - CMAKE_OPTIONS="${CMAKE_OPTIONS} -DVTK_USE_64BIT_IDS:BOOL=OFF" + CMAKE_OPTIONS+=" -DVTK_USE_64BIT_IDS:BOOL=OFF" fi -CMAKE_OPTIONS="${CMAKE_OPTIONS} -DVTK_PYTHON_SITE_PACKAGES_SUFFIX=site-packages" -CMAKE_OPTIONS="${CMAKE_OPTIONS} -DVTKm_INSTALL_LIB_DIR=lib/paraview-${PVLIBVERSION}" +CMAKE_OPTIONS+=" -DVTK_PYTHON_SITE_PACKAGES_SUFFIX=site-packages" +CMAKE_OPTIONS+=" -DVTKm_INSTALL_LIB_DIR=lib/paraview-${PVLIBVERSION}" -CMAKE_OPTIONS="${CMAKE_OPTIONS} -DVTK_REPORT_OPENGL_ERRORS:BOOL=OFF" +CMAKE_OPTIONS+=" -DVTK_REPORT_OPENGL_ERRORS:BOOL=OFF" -CMAKE_OPTIONS="${CMAKE_OPTIONS} -DVTK_MODULE_ENABLE_VTK_RenderingLOD:INTERNAL=YES" -CMAKE_OPTIONS="${CMAKE_OPTIONS} -DVTK_MODULE_ENABLE_VTK_FiltersCore:INTERNAL=YES" -CMAKE_OPTIONS="${CMAKE_OPTIONS} -DVTK_MODULE_ENABLE_VTK_CommonCore:INTERNAL=YES" -CMAKE_OPTIONS="${CMAKE_OPTIONS} -DVTK_MODULE_ENABLE_VTK_IOCore:INTERNAL=YES" -CMAKE_OPTIONS="${CMAKE_OPTIONS} -DVTK_MODULE_ENABLE_VTK_IOEnSight:INTERNAL=YES" -CMAKE_OPTIONS="${CMAKE_OPTIONS} -DVTK_MODULE_ENABLE_VTK_IOInfovis:INTERNAL=YES" +CMAKE_OPTIONS+=" -DVTK_MODULE_ENABLE_VTK_RenderingLOD:INTERNAL=YES" +CMAKE_OPTIONS+=" -DVTK_MODULE_ENABLE_VTK_FiltersCore:INTERNAL=YES" +CMAKE_OPTIONS+=" -DVTK_MODULE_ENABLE_VTK_CommonCore:INTERNAL=YES" +CMAKE_OPTIONS+=" -DVTK_MODULE_ENABLE_VTK_IOCore:INTERNAL=YES" +CMAKE_OPTIONS+=" -DVTK_MODULE_ENABLE_VTK_IOEnSight:INTERNAL=YES" +CMAKE_OPTIONS+=" -DVTK_MODULE_ENABLE_VTK_IOInfovis:INTERNAL=YES" ### TBB settings (in case of a system installation, TBB will be detected automatically) if [ -n "$TBB_ROOT_DIR" ] then - CMAKE_OPTIONS="${CMAKE_OPTIONS} -DTBB_ROOT:PATH=${TBB_ROOT_DIR}" + CMAKE_OPTIONS+=" -DTBB_ROOT:PATH=${TBB_ROOT_DIR}" fi ### Qt settings -CMAKE_OPTIONS="${CMAKE_OPTIONS} -DPARAVIEW_USE_QT:BOOL=ON" -CMAKE_OPTIONS="${CMAKE_OPTIONS} -DVTK_BUILD_QT_DESIGNER_PLUGIN:BOOL=OFF" +CMAKE_OPTIONS+=" -DPARAVIEW_USE_QT:BOOL=ON" +CMAKE_OPTIONS+=" -DVTK_BUILD_QT_DESIGNER_PLUGIN:BOOL=OFF" ### Python settings -CMAKE_OPTIONS="${CMAKE_OPTIONS} -DPARAVIEW_USE_PYTHON:BOOL=ON" -CMAKE_OPTIONS="${CMAKE_OPTIONS} -DVTK_WRAP_PYTHON:BOOL=ON" +CMAKE_OPTIONS+=" -DPARAVIEW_USE_PYTHON:BOOL=ON" +CMAKE_OPTIONS+=" -DVTK_WRAP_PYTHON:BOOL=ON" if [ "${PYTHON_ROOT_DIR}" != "/usr" ] then - 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" + CMAKE_OPTIONS+=" -DPython3_INCLUDE_DIR:STRING=${PYTHON_ROOT_DIR}/include/python${PYTHON_VERSION}" + CMAKE_OPTIONS+=" -DPython3_LIBRARY:STRING=${PYTHON_ROOT_DIR}/lib/libpython${PYTHON_VERSION}.so" fi -CMAKE_OPTIONS="${CMAKE_OPTIONS} -DVTK_PYTHON_FULL_THREADSAFE:BOOL=ON" -CMAKE_OPTIONS="${CMAKE_OPTIONS} -DVTK_NO_PYTHON_THREADS:BOOL=OFF" -CMAKE_OPTIONS="${CMAKE_OPTIONS} -DVTK_PYTHON_VERSION:STRING=3" +CMAKE_OPTIONS+=" -DVTK_PYTHON_FULL_THREADSAFE:BOOL=ON" +CMAKE_OPTIONS+=" -DVTK_NO_PYTHON_THREADS:BOOL=OFF" +CMAKE_OPTIONS+=" -DVTK_PYTHON_VERSION:STRING=3" ### Java settings -CMAKE_OPTIONS="${CMAKE_OPTIONS} -DVTK_WRAP_JAVA:BOOL=OFF" +CMAKE_OPTIONS+=" -DVTK_WRAP_JAVA:BOOL=OFF" ### MPI settings if [ -n "$SAT_HPC" ] then - CMAKE_OPTIONS="${CMAKE_OPTIONS} -DPARAVIEW_USE_MPI:BOOL=ON" + CMAKE_OPTIONS+=" -DPARAVIEW_USE_MPI:BOOL=ON" if [ -n "$MPI_ROOT_DIR" ]; then CMAKE_OPTIONS+=" -DCMAKE_CXX_COMPILER:STRING=${MPI_CXX_COMPILER}" CMAKE_OPTIONS+=" -DCMAKE_C_COMPILER:STRING=${MPI_C_COMPILER}" fi - CMAKE_OPTIONS="${CMAKE_OPTIONS} -DVTK_SMP_IMPLEMENTATION_TYPE=OpenMP -DVTKm_ENABLE_OPENMP=ON" - CMAKE_OPTIONS="${CMAKE_OPTIONS} -DVTK_MODULE_ENABLE_VTK_FiltersParallelMPI=YES" - CMAKE_OPTIONS="${CMAKE_OPTIONS} -DVTK_MODULE_ENABLE_VTK_ParallelMPI=YES" - CMAKE_OPTIONS="${CMAKE_OPTIONS} -DMPI_C_FOUND=${MPI_C_FOUND}" + CMAKE_OPTIONS+=" -DVTK_SMP_IMPLEMENTATION_TYPE=OpenMP -DVTKm_ENABLE_OPENMP=ON" + CMAKE_OPTIONS+=" -DVTK_MODULE_ENABLE_VTK_FiltersParallelMPI=YES" + CMAKE_OPTIONS+=" -DVTK_MODULE_ENABLE_VTK_ParallelMPI=YES" + CMAKE_OPTIONS+=" -DMPI_C_FOUND=${MPI_C_FOUND}" elif [ -n "$VTK_SMP_IMPLEMENTATION_TYPE" ] then echo "WARNING: VTK_SMP_IMPLEMENTATION_TYPE environment variable was found...." - CMAKE_OPTIONS="${CMAKE_OPTIONS} -DPARAVIEW_USE_MPI:BOOL=OFF" - CMAKE_OPTIONS="${CMAKE_OPTIONS} -DCMAKE_CXX_COMPILER:STRING=`which g++`" - CMAKE_OPTIONS="${CMAKE_OPTIONS} -DCMAKE_C_COMPILER:STRING=`which gcc`" + CMAKE_OPTIONS+=" -DPARAVIEW_USE_MPI:BOOL=OFF" + CMAKE_OPTIONS+=" -DCMAKE_CXX_COMPILER:STRING=`which g++`" + CMAKE_OPTIONS+=" -DCMAKE_C_COMPILER:STRING=`which gcc`" if [[ $VTK_SMP_IMPLEMENTATION_TYPE = "sequential" ]] then echo "WARNING: sequential approach will be used..." - CMAKE_OPTIONS="${CMAKE_OPTIONS} -DPARAVIEW_USE_MPI:BOOL=OFF" - CMAKE_OPTIONS="${CMAKE_OPTIONS} -DCMAKE_CXX_COMPILER:STRING=`which g++`" - CMAKE_OPTIONS="${CMAKE_OPTIONS} -DCMAKE_C_COMPILER:STRING=`which gcc`" + CMAKE_OPTIONS+=" -DPARAVIEW_USE_MPI:BOOL=OFF" + CMAKE_OPTIONS+=" -DCMAKE_CXX_COMPILER:STRING=`which g++`" + CMAKE_OPTIONS+=" -DCMAKE_C_COMPILER:STRING=`which gcc`" elif [[ $VTK_SMP_IMPLEMENTATION_TYPE = "TBB" ]] then echo "WARNING: VTK_SMP_IMPLEMENTATION_TYPE was set to: TBB..." - CMAKE_OPTIONS="${CMAKE_OPTIONS} -DVTK_SMP_IMPLEMENTATION_TYPE=TBB -DVTKm_ENABLE_TBB:BOOL=ON" + CMAKE_OPTIONS+=" -DVTK_SMP_IMPLEMENTATION_TYPE=TBB -DVTKm_ENABLE_TBB:BOOL=ON" elif [[ $VTK_SMP_IMPLEMENTATION_TYPE = "OpenMP" ]] then echo "WARNING: VTK_SMP_IMPLEMENTATION_TYPE was set to: OpenMP..." - CMAKE_OPTIONS="${CMAKE_OPTIONS} -DVTK_SMP_IMPLEMENTATION_TYPE=OpenMP -DVTKm_ENABLE_OPENMP:BOOL=ON" + CMAKE_OPTIONS+=" -DVTK_SMP_IMPLEMENTATION_TYPE=OpenMP -DVTKm_ENABLE_OPENMP:BOOL=ON" else echo "ERROR: Unknown ${VTK_SMP_IMPLEMENTATION_TYPE} option.... aborting!" exit 1 fi else echo "WARNING: MPI will not be supported!" - CMAKE_OPTIONS="${CMAKE_OPTIONS} -DPARAVIEW_USE_MPI:BOOL=OFF" - CMAKE_OPTIONS="${CMAKE_OPTIONS} -DCMAKE_CXX_COMPILER:STRING=`which g++`" - CMAKE_OPTIONS="${CMAKE_OPTIONS} -DCMAKE_C_COMPILER:STRING=`which gcc`" + CMAKE_OPTIONS+=" -DPARAVIEW_USE_MPI:BOOL=OFF" + CMAKE_OPTIONS+=" -DCMAKE_CXX_COMPILER:STRING=`which g++`" + CMAKE_OPTIONS+=" -DCMAKE_C_COMPILER:STRING=`which gcc`" fi ### HDF5 settings -CMAKE_OPTIONS="${CMAKE_OPTIONS} -DVTK_MODULE_USE_EXTERNAL_VTK_hdf5:BOOL=ON" -CMAKE_OPTIONS="${CMAKE_OPTIONS} -DHDF5_DIR:PATH=${HDF5_ROOT_DIR}/share/cmake/hdf5" -CMAKE_OPTIONS="${CMAKE_OPTIONS} -DHDF5_USE_STATIC_LIBRARIES:BOOL=OFF" -CMAKE_OPTIONS="${CMAKE_OPTIONS} -DHDF5_ROOT:PATH=${HDF5_ROOT_DIR}" -CMAKE_OPTIONS="${CMAKE_OPTIONS} -DHDF5_hdf5_LIBRARY_RELEASE=${HDF5_ROOT_DIR}/lib" -CMAKE_OPTIONS="${CMAKE_OPTIONS} -DHDF5_hdf5_hl_LIBRARY_RELEASE=${HDF5_ROOT_DIR}/lib/libhdf5_hl.so" -CMAKE_OPTIONS="${CMAKE_OPTIONS} -DHDF5_hdf5_CXX_LIBRARY_RELEASE=${HDF5_ROOT_DIR}/lib/libhdf5_cpp.so" -CMAKE_OPTIONS="${CMAKE_OPTIONS} -DHDF5_HL_LIBRARY=${HDF5_ROOT_DIR}/lib/libhdf5_hl.so" -CMAKE_OPTIONS="${CMAKE_OPTIONS} -DHDF5_C_INCLUDE_DIR=${HDF5_ROOT_DIR}/include" +CMAKE_OPTIONS+=" -DVTK_MODULE_USE_EXTERNAL_VTK_hdf5:BOOL=ON" +CMAKE_OPTIONS+=" -DHDF5_DIR:PATH=${HDF5_ROOT_DIR}/share/cmake/hdf5" +CMAKE_OPTIONS+=" -DHDF5_USE_STATIC_LIBRARIES:BOOL=OFF" +CMAKE_OPTIONS+=" -DHDF5_ROOT:PATH=${HDF5_ROOT_DIR}" +CMAKE_OPTIONS+=" -DHDF5_hdf5_LIBRARY_RELEASE=${HDF5_ROOT_DIR}/lib" +CMAKE_OPTIONS+=" -DHDF5_hdf5_hl_LIBRARY_RELEASE=${HDF5_ROOT_DIR}/lib/libhdf5_hl.so" +CMAKE_OPTIONS+=" -DHDF5_hdf5_CXX_LIBRARY_RELEASE=${HDF5_ROOT_DIR}/lib/libhdf5_cpp.so" +CMAKE_OPTIONS+=" -DHDF5_HL_LIBRARY=${HDF5_ROOT_DIR}/lib/libhdf5_hl.so" +CMAKE_OPTIONS+=" -DHDF5_C_INCLUDE_DIR=${HDF5_ROOT_DIR}/include" ### CGNS -CMAKE_OPTIONS="${CMAKE_OPTIONS} -DVTK_MODULE_USE_EXTERNAL_ParaView_cgns:BOOL=ON" +CMAKE_OPTIONS+=" -DVTK_MODULE_USE_EXTERNAL_ParaView_cgns:BOOL=ON" if [ "$CGNS_ROOT_DIR" != "/usr" ] then - 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" + CMAKE_OPTIONS+=" -DCGNS_INCLUDE_DIR:PATH=${CGNS_ROOT_DIR}/include" + 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_ENABLE_ParaView_VTKExtensionsCGNSReader:INTERNAL=YES" -CMAKE_OPTIONS="${CMAKE_OPTIONS} -DVTK_MODULE_ENABLE_ParaView_VTKExtensionsCGNSWriter:INTERNAL=YES" +CMAKE_OPTIONS+=" -DVTK_MODULE_ENABLE_ParaView_cgns:INTERNAL=YES" +CMAKE_OPTIONS+=" -DVTK_MODULE_ENABLE_ParaView_VTKExtensionsCGNSReader:INTERNAL=YES" +CMAKE_OPTIONS+=" -DVTK_MODULE_ENABLE_ParaView_VTKExtensionsCGNSWriter:INTERNAL=YES" ### VisIt Database bridge settings -CMAKE_OPTIONS="${CMAKE_OPTIONS} -DPARAVIEW_ENABLE_VISITBRIDGE:BOOL=ON" +CMAKE_OPTIONS+=" -DPARAVIEW_ENABLE_VISITBRIDGE:BOOL=ON" ### Boost settings -CMAKE_OPTIONS="${CMAKE_OPTIONS} -DBOOST_ROOT:PATH=${BOOST_ROOT_DIR}" -CMAKE_OPTIONS="${CMAKE_OPTIONS} -DBoost_NO_BOOST_CMAKE:BOOL=ON" -CMAKE_OPTIONS="${CMAKE_OPTIONS} -DBoost_NO_SYSTEM_PATHS:BOOL=ON" +CMAKE_OPTIONS+=" -DBOOST_ROOT:PATH=${BOOST_ROOT_DIR}" +CMAKE_OPTIONS+=" -DBoost_NO_BOOST_CMAKE:BOOL=ON" +CMAKE_OPTIONS+=" -DBoost_NO_SYSTEM_PATHS:BOOL=ON" ### gl2ps settings -CMAKE_OPTIONS="${CMAKE_OPTIONS} -DVTK_MODULE_USE_EXTERNAL_VTK_gl2ps:BOOL=OFF" +CMAKE_OPTIONS+=" -DVTK_MODULE_USE_EXTERNAL_VTK_gl2ps:BOOL=OFF" ### libxml2 settings 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+=" -DVTK_MODULE_USE_EXTERNAL_VTK_libxml2:BOOL=ON" if [ "${LIBXML2_ROOT_DIR}" != "/usr" ] then - 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" + CMAKE_OPTIONS+=" -DLIBXML2_INCLUDE_DIR:STRING=${LIBXML2_ROOT_DIR}/include/libxml2" + CMAKE_OPTIONS+=" -DLIBXML2_LIBRARIES:STRING=${LIBXML2_ROOT_DIR}/lib/libxml2.so" + CMAKE_OPTIONS+=" -DLIBXML2_XMLLINT_EXECUTABLE=${LIBXML2_ROOT_DIR}/bin/xmllint" fi fi ### freetype settings -CMAKE_OPTIONS="${CMAKE_OPTIONS} -DVTK_MODULE_USE_EXTERNAL_VTK_freetype:BOOL=ON" +CMAKE_OPTIONS+=" -DVTK_MODULE_USE_EXTERNAL_VTK_freetype:BOOL=ON" 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" - CMAKE_OPTIONS="${CMAKE_OPTIONS} -DFREETYPE_LIBRARY:STRING=${FREETYPE_ROOT_DIR}/lib/libfreetype.so" + CMAKE_OPTIONS+=" -DFREETYPE_INCLUDE_DIRS:STRING=${FREETYPE_ROOT_DIR}/include/freetype2" + CMAKE_OPTIONS+=" -DFREETYPE_LIBRARY:STRING=${FREETYPE_ROOT_DIR}/lib/libfreetype.so" fi ### Extra options -CMAKE_OPTIONS="${CMAKE_OPTIONS} -DPARAVIEW_PLUGINS_DEFAULT:BOOL=ON" -CMAKE_OPTIONS="${CMAKE_OPTIONS} -DPARAVIEW_PLUGIN_ENABLE_Moments:BOOL=OFF" -CMAKE_OPTIONS="${CMAKE_OPTIONS} -DPARAVIEW_PLUGIN_ENABLE_SLACTools:BOOL=OFF" -CMAKE_OPTIONS="${CMAKE_OPTIONS} -DPARAVIEW_PLUGIN_ENABLE_PacMan:BOOL=OFF" -CMAKE_OPTIONS="${CMAKE_OPTIONS} -DPARAVIEW_PLUGIN_ENABLE_pvblot:BOOL=OFF" +CMAKE_OPTIONS+=" -DPARAVIEW_PLUGINS_DEFAULT:BOOL=ON" +CMAKE_OPTIONS+=" -DPARAVIEW_PLUGIN_ENABLE_Moments:BOOL=OFF" +CMAKE_OPTIONS+=" -DPARAVIEW_PLUGIN_ENABLE_SLACTools:BOOL=OFF" +CMAKE_OPTIONS+=" -DPARAVIEW_PLUGIN_ENABLE_PacMan:BOOL=OFF" +CMAKE_OPTIONS+=" -DPARAVIEW_PLUGIN_ENABLE_pvblot:BOOL=OFF" # allow additional plugins -CMAKE_OPTIONS="${CMAKE_OPTIONS} -DVTK_ALL_NEW_OBJECT_FACTORY:BOOL=ON" +CMAKE_OPTIONS+=" -DVTK_ALL_NEW_OBJECT_FACTORY:BOOL=ON" # Openturns: if [ -n "$OT_VERSION" ]; then function version_ge() { test "$(echo "$@" | tr " " "\n" | sort -rV | head -n 1)" == "$1"; } if version_ge $OT_VERSION "1.17" ; then echo "INFO: Adding OpenTURNS version ${OT_VERSION} support..." - CMAKE_OPTIONS="${CMAKE_OPTIONS} -DPARAVIEW_ENABLE_OPENTURNS=ON" - CMAKE_OPTIONS="${CMAKE_OPTIONS} -DOpenTURNS_DIR=$OT_ROOT_DIR/lib/cmake/openturns" + CMAKE_OPTIONS+=" -DPARAVIEW_ENABLE_OPENTURNS=ON" + CMAKE_OPTIONS+=" -DOpenTURNS_DIR=$OT_ROOT_DIR/lib/cmake/openturns" else echo "WARNING: OpenTURNS ${OT_VERSON} is not supported with current ParaView build..." fi @@ -233,6 +233,15 @@ else echo "WARNING: No OpenTURNS environment variable is found..." fi +# GDAL see bos #26944 +if [ -n "$GDAL_ROOT_DIR" ]; then + echo "INFO: switching ON GDAL" + CMAKE_OPTIONS+=" -DPARAVIEW_ENABLE_GDAL=ON" + if [ "$GDAL_ROOT_DIR" != "/usr" ]; then + CMAKE_OPTIONS+=" -DGDAL_ROOT_DIR=$GDAL_ROOT_DIR" + fi +fi + echo echo "*** cmake" ${CMAKE_OPTIONS} cmake ${CMAKE_OPTIONS} $SOURCE_DIR diff --git a/products/env_scripts/CAS.py b/products/env_scripts/CAS.py index 4f153b3..e9a3282 100755 --- a/products/env_scripts/CAS.py +++ b/products/env_scripts/CAS.py @@ -7,7 +7,6 @@ import platform def set_env(env, prereq_dir, version): env.set('CASROOT', prereq_dir) env.set('CAS_ROOT_DIR', prereq_dir) - # [CMake GUI] Nouveau nom pour CASROOT = CAS_ROOT_DIR 22/03/2013 env.set('OPENCASCADE_ROOT_DIR', prereq_dir) env.prepend('PATH', prereq_dir) @@ -16,7 +15,6 @@ def set_env(env, prereq_dir, version): else : env.prepend('PATH', os.path.join(prereq_dir, 'bin')) env.prepend('LD_LIBRARY_PATH', os.path.join(prereq_dir, 'lib')) - def set_nativ_env(env): pass diff --git a/products/env_scripts/ParaView.py b/products/env_scripts/ParaView.py index c72e3f9..c02be96 100644 --- a/products/env_scripts/ParaView.py +++ b/products/env_scripts/ParaView.py @@ -51,6 +51,8 @@ def set_paraview_env(env, version): else: paralib = os.path.join(root, lib_dir, 'paraview-' + version) env.prepend('PV_PLUGIN_PATH', paralib) + # bos #26828 + env.prepend('PV_PLUGIN_PATH', os.path.join(paralib, 'plugins')) env.prepend('PYTHONPATH', os.path.join(paralib, 'site-packages')) env.prepend('PYTHONPATH', os.path.join(paralib, 'site-packages', 'vtk')) env.prepend('PATH', os.path.join(root, 'include', 'paraview-' + version)) -- 2.39.2