From 30ed5d429524a80ae9e686ed08fdb9c73b1b89d7 Mon Sep 17 00:00:00 2001 From: Quentin Cozette Date: Thu, 25 Mar 2021 20:34:55 +0100 Subject: [PATCH] Fix some remaining issue about ParaView 5.9 integration - Switch CAS source to archive --- applications/SALOME-master-native.pyconf | 32 +++++++++++++++-------- products/CAS.pyconf | 10 +++++-- products/ParaView.pyconf | 18 ++++++++----- products/compil_scripts/ParaView-5.9.0.sh | 4 +-- products/compil_scripts/netgen_5_3_1.sh | 2 +- 5 files changed, 44 insertions(+), 22 deletions(-) diff --git a/applications/SALOME-master-native.pyconf b/applications/SALOME-master-native.pyconf index 1421702..541e3b6 100644 --- a/applications/SALOME-master-native.pyconf +++ b/applications/SALOME-master-native.pyconf @@ -178,12 +178,7 @@ APPLICATION : __overwrite__ : [ { - # 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'] } { @@ -194,12 +189,26 @@ __overwrite__ : '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). + # + __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). - __condition__ : "VARS.dist in ['DB10', 'UB20.04']" - 'PRODUCTS.ParaView.version_5_8_0.patches' : ['paraview.0003-ParaViewClient.patch', - 'paraview.0003-ParaViewClient_native.patch'] + # 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. @@ -207,5 +216,6 @@ __overwrite__ : __condition__ : "VARS.dist in ['CO8']" 'APPLICATION.products.sphinxintl' : '0.9.10' 'PRODUCTS.sphinxintl.default.properties.pip' : "no" + 'APPLICATION.products.cmake' : '3.12.1' } ] diff --git a/products/CAS.pyconf b/products/CAS.pyconf index 8966a13..3c18835 100755 --- a/products/CAS.pyconf +++ b/products/CAS.pyconf @@ -42,7 +42,8 @@ version_V7_5_0 : 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 : "git" + get_source : "archive" git_info: { repo : "http://git.dev.opencascade.org/repos/occt.git" @@ -80,7 +81,12 @@ version_V7_5_0_win : name : "CAS" build_source : "script" compil_script : "CAS_7.5.bat" - get_source : "git" +# get_source : "git" + get_source : "archive" + archive_info : + { + archive_name : "CAS-CR750-SALOME-PATCH.tar.gz" + } git_info: { repo : "http://git.dev.opencascade.org/repos/occt.git" diff --git a/products/ParaView.pyconf b/products/ParaView.pyconf index 975acef..93ec6a0 100755 --- a/products/ParaView.pyconf +++ b/products/ParaView.pyconf @@ -40,7 +40,8 @@ version_5_9_0 : '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-0012-LATA_64BITS_IDS.patch', + 'ParaView-5.9.0-CATALYST_cmake.patch' ] } @@ -53,7 +54,8 @@ version_5_9_0_int32 : 'paraview.0004-ParaView_hdf5.patch', 'paraview.0005-ParaView_find_cgns.patch', 'paraview.0006-ParaView_find_libxml2.patch', - 'paraview.0007-ParaView_find_freetype.patch' + 'paraview.0007-ParaView_find_freetype.patch', + 'ParaView-5.9.0-CATALYST_cmake.patch' ] } @@ -80,7 +82,8 @@ version_5_9_0_win : '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-0012-LATA_64BITS_IDS.patch', + 'ParaView-5.9.0-CATALYST_cmake.patch' ] } @@ -106,7 +109,8 @@ version_5_9_0_win_int32 : '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.0008-ParaView_find_zlib.patch', + 'ParaView-5.9.0-CATALYST_cmake.patch' ] } @@ -120,7 +124,8 @@ version_5_9_0_MPI : 'paraview.0006-ParaView_find_libxml2.patch', 'paraview.0007-ParaView_find_freetype.patch', 'paraview.0012-VTKM_MPI.patch', - 'paraview-0012-LATA_64BITS_IDS.patch' + 'paraview-0012-LATA_64BITS_IDS.patch', + 'ParaView-5.9.0-CATALYST_cmake.patch' ] } @@ -133,7 +138,8 @@ version_5_9_0_MPI_int32 : 'paraview.0005-ParaView_find_cgns.patch', 'paraview.0006-ParaView_find_libxml2.patch', 'paraview.0007-ParaView_find_freetype.patch', - 'paraview.0012-VTKM_MPI.patch' + 'paraview.0012-VTKM_MPI.patch', + 'ParaView-5.9.0-CATALYST_cmake.patch' ] } diff --git a/products/compil_scripts/ParaView-5.9.0.sh b/products/compil_scripts/ParaView-5.9.0.sh index 509e3e6..477b536 100755 --- a/products/compil_scripts/ParaView-5.9.0.sh +++ b/products/compil_scripts/ParaView-5.9.0.sh @@ -29,8 +29,8 @@ CMAKE_OPTIONS="${CMAKE_OPTIONS} -DPARAVIEW_INSTALL_DEVELOPMENT_FILES:BOOL=ON" ### 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=ON" +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 diff --git a/products/compil_scripts/netgen_5_3_1.sh b/products/compil_scripts/netgen_5_3_1.sh index 824af2e..45c30b0 100755 --- a/products/compil_scripts/netgen_5_3_1.sh +++ b/products/compil_scripts/netgen_5_3_1.sh @@ -63,7 +63,7 @@ OLEVEL="-O2" if [ "${TCLHOME}" != '/usr' ] then - TCK_TK_OPTIONS="--with-tcl=${TCL_LIB_DIR} --with-tk=${TCLHOME}/lib --with-tclinclude=${TCLHOME}/include" + TCL_TK_OPTIONS="--with-tcl=${TCLHOME}/lib --with-tk=${TCLHOME}/lib --with-tclinclude=${TCLHOME}/include" fi echo ./configure --prefix=${PRODUCT_INSTALL} \ --with-occ=${CASROOT} \ -- 2.39.2