From cf50335eb29d1b68c5a90b3a3cd1e9237894a617 Mon Sep 17 00:00:00 2001 From: Quentin Cozette Date: Mon, 21 Dec 2020 19:41:59 +0100 Subject: [PATCH] Standard paraview.0003 patch is needed to build PARAVIS - rework the additional patch to rewrite on it --- applications/SALOME-master-native.pyconf | 6 ++++-- ...tive.patch => paraview.0003-ParaViewClient_native.patch} | 6 +++--- 2 files changed, 7 insertions(+), 5 deletions(-) rename products/patches/{ParaViewClient_native.patch => paraview.0003-ParaViewClient_native.patch} (60%) diff --git a/applications/SALOME-master-native.pyconf b/applications/SALOME-master-native.pyconf index f59be8b..38c46fc 100644 --- a/applications/SALOME-master-native.pyconf +++ b/applications/SALOME-master-native.pyconf @@ -189,9 +189,11 @@ __overwrite__ : } { # 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) + # 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']" - 'PRODUCTS.ParaView.version_5_8_0.patches' : ['ParaViewClient_native.patch'] + 'PRODUCTS.ParaView.version_5_8_0.patches' : ['paraview.0003-ParaViewClient.patch', + 'paraview.0003-ParaViewClient_native.patch'] } ] diff --git a/products/patches/ParaViewClient_native.patch b/products/patches/paraview.0003-ParaViewClient_native.patch similarity index 60% rename from products/patches/ParaViewClient_native.patch rename to products/patches/paraview.0003-ParaViewClient_native.patch index c1b303e..74d8333 100644 --- a/products/patches/ParaViewClient_native.patch +++ b/products/patches/paraview.0003-ParaViewClient_native.patch @@ -1,10 +1,10 @@ ---- ParaView/CMake/ParaViewClient.cmake 2020-03-23 22:06:19.000000000 +0100 -+++ ParaView.new/CMake/ParaViewClient.cmake 2020-12-17 11:52:15.201636975 +0100 +--- 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) - -- 2.39.2