public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: sci-visualization/paraview/files/
@ 2017-04-23  0:06 Matthias Maier
  0 siblings, 0 replies; 5+ messages in thread
From: Matthias Maier @ 2017-04-23  0:06 UTC (permalink / raw
  To: gentoo-commits

commit:     21aa6ef90b5eb05e1042b42ecd5a70387d65b775
Author:     Matthias Maier <tamiko <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 23 00:06:14 2017 +0000
Commit:     Matthias Maier <tamiko <AT> gentoo <DOT> org>
CommitDate: Sun Apr 23 00:06:14 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=21aa6ef9

sci-visualization/paraview: resurrect missing patches, bug #615762

Package-Manager: Portage-2.3.5, Repoman-2.3.2

 .../paraview/files/paraview-4.0.1-gcc-4.7.patch    | 28 ++++++++++++++++++++++
 .../files/paraview-4.1.0-no-fatal-warnings.patch   | 19 +++++++++++++++
 2 files changed, 47 insertions(+)

diff --git a/sci-visualization/paraview/files/paraview-4.0.1-gcc-4.7.patch b/sci-visualization/paraview/files/paraview-4.0.1-gcc-4.7.patch
new file mode 100644
index 00000000000..1b941cfa943
--- /dev/null
+++ b/sci-visualization/paraview/files/paraview-4.0.1-gcc-4.7.patch
@@ -0,0 +1,28 @@
+Description: fix FTBFS with gcc-4.7
+Author: Mathieu Malaterre <malat@debian.org>
+Origin: http://anonscm.debian.org/gitweb/?p=collab-maint/vtk.git;a=commitdiff;h=428e763c995bb303805e07da70c1a34fc103d208
+Reviewed-by: Anton Gladky <gladky.anton@gmail.com>
+Last-Update: 2012-05-08
+
+--- a/VTK/Rendering/FreeType/vtkFreeTypeTools.cxx
++++ b/VTK/Rendering/FreeType/vtkFreeTypeTools.cxx
+@@ -35,6 +35,8 @@
+ using namespace ftgl;
+ #endif
+ 
++#include <stdint.h>
++
+ // Print debug info
+ #define VTK_FTFC_DEBUG 0
+ #define VTK_FTFC_DEBUG_CD 0
+--- a/VTK/Rendering/FreeType/vtkFreeTypeUtilities.cxx
++++ b/VTK/Rendering/FreeType/vtkFreeTypeUtilities.cxx
+@@ -36,6 +36,8 @@
+ using namespace ftgl;
+ #endif
+ 
++#include <stdint.h>
++
+ // Print debug info
+ 
+ #define VTK_FTFC_DEBUG 0

diff --git a/sci-visualization/paraview/files/paraview-4.1.0-no-fatal-warnings.patch b/sci-visualization/paraview/files/paraview-4.1.0-no-fatal-warnings.patch
new file mode 100644
index 00000000000..531be2f614f
--- /dev/null
+++ b/sci-visualization/paraview/files/paraview-4.1.0-no-fatal-warnings.patch
@@ -0,0 +1,19 @@
+diff --git a/VTK/CMake/vtkCompilerExtras.cmake b/VTK/CMake/vtkCompilerExtras.cmake
+index 05b2db9..48d9395 100644
+--- a/VTK/CMake/vtkCompilerExtras.cmake
++++ b/VTK/CMake/vtkCompilerExtras.cmake
+@@ -15,11 +15,11 @@ if(CMAKE_COMPILER_IS_GNUCXX)
+   # If we are compiling on Linux then set some extra linker flags too
+   if(CMAKE_SYSTEM_NAME MATCHES Linux)
+     set(CMAKE_SHARED_LINKER_FLAGS
+-      "-Wl,--fatal-warnings -Wl,--no-undefined -lc ${CMAKE_SHARED_LINKER_FLAGS}")
++      "-Wl,--no-undefined -lc ${CMAKE_SHARED_LINKER_FLAGS}")
+     set(CMAKE_MODULE_LINKER_FLAGS
+-      "-Wl,--fatal-warnings -Wl,--no-undefined -lc ${CMAKE_SHARED_LINKER_FLAGS}")
++      "-Wl,--no-undefined -lc ${CMAKE_SHARED_LINKER_FLAGS}")
+     set (CMAKE_EXE_LINKER_FLAGS
+-      "-Wl,--fatal-warnings -Wl,--no-undefined -lc ${CMAKE_SHARED_LINKER_FLAGS}")
++      "-Wl,--no-undefined -lc ${CMAKE_SHARED_LINKER_FLAGS}")
+   endif()
+ 
+   # Now check if we can use visibility to selectively export symbols


^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-visualization/paraview/files/
@ 2019-08-05  0:08 Matthias Maier
  0 siblings, 0 replies; 5+ messages in thread
From: Matthias Maier @ 2019-08-05  0:08 UTC (permalink / raw
  To: gentoo-commits

commit:     73ae0aa9dc7cfada6451f57398faf2e0adf47d7b
Author:     Matthias Maier <tamiko <AT> gentoo <DOT> org>
AuthorDate: Sun Aug  4 22:47:26 2019 +0000
Commit:     Matthias Maier <tamiko <AT> gentoo <DOT> org>
CommitDate: Mon Aug  5 00:07:38 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=73ae0aa9

sci-visualization/paraview: apply proper OpenMP 4 fix

Let's apply the proper upstream fix for OpenMP 4. This fixes compilation
issues with older gcc.

Closes: https://bugs.gentoo.org/689054
Package-Manager: Portage-2.3.70, Repoman-2.3.16
Signed-off-by: Matthias Maier <tamiko <AT> gentoo.org>

 .../files/paraview-5.6.1-fix_openmp_4.0.patch      | 77 ++++++++++++++++++----
 1 file changed, 63 insertions(+), 14 deletions(-)

diff --git a/sci-visualization/paraview/files/paraview-5.6.1-fix_openmp_4.0.patch b/sci-visualization/paraview/files/paraview-5.6.1-fix_openmp_4.0.patch
index 51562415031..cf215070893 100644
--- a/sci-visualization/paraview/files/paraview-5.6.1-fix_openmp_4.0.patch
+++ b/sci-visualization/paraview/files/paraview-5.6.1-fix_openmp_4.0.patch
@@ -1,32 +1,81 @@
-diff -urNd ParaView-v5.6.0/VTK/ThirdParty/vtkm/vtk-m/vtkm/cont/openmp/internal/FunctorsOpenMP.h ParaView-v5.6.0-openmp/VTK/ThirdParty/vtkm/vtk-m/vtkm/cont/openmp/internal/FunctorsOpenMP.h
---- ParaView-v5.6.0/VTK/ThirdParty/vtkm/vtk-m/vtkm/cont/openmp/internal/FunctorsOpenMP.h	2018-11-07 05:05:18.000000000 +1000
-+++ ParaView-v5.6.0-openmp/VTK/ThirdParty/vtkm/vtk-m/vtkm/cont/openmp/internal/FunctorsOpenMP.h	2019-06-28 14:04:02.292922908 +1000
-@@ -290,7 +290,7 @@
+From e30cb0872593d1614392817762b871de36e4c2f3 Mon Sep 17 00:00:00 2001
+From: Allison Vacanti <allison.vacanti@kitware.com>
+Date: Thu, 27 Jun 2019 16:04:53 -0400
+Subject: [PATCH] Fix OpenMP for gcc-9 backwards incompatibility.
+
+For details, see
+
+https://www.gnu.org/software/gcc/gcc-9/porting_to.html
+---
+ vtkm/cont/openmp/internal/FunctorsOpenMP.h     | 18 +++++++++++++++---
+ vtkm/cont/openmp/internal/ParallelSortOpenMP.h |  4 +++-
+ 2 files changed, 18 insertions(+), 4 deletions(-)
+
+diff --git ParaView-v5.6.0/VTK/ThirdParty/vtkm/vtk-m/vtkm/cont/openmp/internal/FunctorsOpenMP.h b/vtkm/cont/openmp/internal/FunctorsOpenMP.h
+index 27cd2bc0..0271754c 100644
+--- ParaView-v5.6.0/VTK/ThirdParty/vtkm/vtk-m/vtkm/cont/openmp/internal/FunctorsOpenMP.h
++++ ParaView-v5.6.0/VTK/ThirdParty/vtkm/vtk-m/vtkm/cont/openmp/internal/FunctorsOpenMP.h
+@@ -36,6 +36,18 @@
+ #define VTKM_OPENMP_DIRECTIVE(directive)
+ #endif // _OPENMP
+ 
++// See "OpenMP data sharing" section of
++// https://www.gnu.org/software/gcc/gcc-9/porting_to.html. OpenMP broke
++// backwards compatibility regarding const variable handling.
++// tl;dr, put all const variables accessed from openmp blocks in a
++// VTKM_OPENMP_SHARED_CONST(var1, var2, ...) macro. This will do The Right Thing
++// on all gcc.
++#if defined(__GNUC__) && __GNUC__ >= 9
++#define VTKM_OPENMP_SHARED_CONST(...) shared(__VA_ARGS__)
++#else
++#define VTKM_OPENMP_SHARED_CONST(...)
++#endif
++
+ // When defined, supported type / operator combinations will use the OpenMP
+ // reduction(...) clause. Otherwise, all reductions use the general
+ // implementation with a manual reduction once the threads complete.
+@@ -279,8 +291,8 @@ struct ReduceHelper
+     int numThreads = 0;
      std::unique_ptr<ReturnType[]> threadData;
  
-     VTKM_OPENMP_DIRECTIVE(parallel default(none) firstprivate(f)
+-    VTKM_OPENMP_DIRECTIVE(parallel default(none) firstprivate(f)
 -                            shared(data, doParallel, numThreads, threadData))
-+                            shared(data, doParallel, numThreads, threadData, numVals))
++    VTKM_OPENMP_DIRECTIVE(parallel default(none) firstprivate(f) shared(
++      data, doParallel, numThreads, threadData) VTKM_OPENMP_SHARED_CONST(numVals))
      {
  
        int tid = omp_get_thread_num();
-@@ -422,7 +422,7 @@
+@@ -412,7 +424,7 @@ void ReduceByKeyHelper(KeysInArray keysInArray,
    vtkm::Id outIdx = 0;
  
    VTKM_OPENMP_DIRECTIVE(parallel default(none) firstprivate(keysIn, valuesIn, keysOut, valuesOut, f)
 -                          shared(outIdx))
-+                          shared(outIdx, numValues))
++                          shared(outIdx) VTKM_OPENMP_SHARED_CONST(numValues))
    {
      int tid = omp_get_thread_num();
      int numThreads = omp_get_num_threads();
-diff -urNd ParaView-v5.6.0/VTK/ThirdParty/vtkm/vtk-m/vtkm/cont/openmp/internal/ParallelSortOpenMP.h ParaView-v5.6.0-openmp/VTK/ThirdParty/vtkm/vtk-m/vtkm/cont/openmp/internal/ParallelSortOpenMP.h
---- ParaView-v5.6.0/VTK/ThirdParty/vtkm/vtk-m/vtkm/cont/openmp/internal/ParallelSortOpenMP.h	2018-11-07 05:05:18.000000000 +1000
-+++ ParaView-v5.6.0-openmp/VTK/ThirdParty/vtkm/vtk-m/vtkm/cont/openmp/internal/ParallelSortOpenMP.h	2019-06-28 13:54:33.132064191 +1000
-@@ -133,6 +133,7 @@
+diff --git a/vtkm/cont/openmp/internal/ParallelSortOpenMP.h b/vtkm/cont/openmp/internal/ParallelSortOpenMP.h
+index e06d1762..a973eee6 100644
+--- ParaView-v5.6.0/VTK/ThirdParty/vtkm/vtk-m/vtkm/cont/openmp/internal/ParallelSortOpenMP.h
++++ ParaView-v5.6.0/VTK/ThirdParty/vtkm/vtk-m/vtkm/cont/openmp/internal/ParallelSortOpenMP.h
+@@ -123,7 +123,8 @@ void parallel_sort_bykey(vtkm::cont::ArrayHandle<T, StorageT>& keys,
        VTKM_OPENMP_DIRECTIVE(parallel for
                              default(none)
                              firstprivate(valuesInPortal, indexPortal, valuesOutPortal)
-+                            shared(size)
-                             schedule(static))
+-                            schedule(static))
++                            schedule(static)
++                            VTKM_OPENMP_SHARED_CONST(size))
        for (vtkm::Id i = 0; i < size; ++i)
        {
+         valuesOutPortal.Set(i, valuesInPortal.Get(indexPortal.Get(i)));
+@@ -209,6 +210,7 @@ void parallel_sort_bykey(vtkm::cont::ArrayHandle<T, StorageT>& keys,
+     VTKM_OPENMP_DIRECTIVE(parallel for
+                           default(none)
+                           firstprivate(valuesInPortal, indexPortal, valuesOutPortal)
++                          VTKM_OPENMP_SHARED_CONST(size)
+                           schedule(static))
+     for (vtkm::Id i = 0; i < size; ++i)
+     {
+-- 
+2.21.0
+


^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-visualization/paraview/files/
@ 2021-05-11 22:04 Sam James
  0 siblings, 0 replies; 5+ messages in thread
From: Sam James @ 2021-05-11 22:04 UTC (permalink / raw
  To: gentoo-commits

commit:     a07aceead4fc27f70a17168ac226d75596997a84
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue May 11 21:56:50 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue May 11 22:04:20 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a07aceea

sci-visualization/paraview: fix gcc 11 build (again)

Closes: https://bugs.gentoo.org/789534
Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../paraview/files/paraview-5.9.0-gcc11-include.patch        | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/sci-visualization/paraview/files/paraview-5.9.0-gcc11-include.patch b/sci-visualization/paraview/files/paraview-5.9.0-gcc11-include.patch
index 900439a7ce6..b9fad8c094f 100644
--- a/sci-visualization/paraview/files/paraview-5.9.0-gcc11-include.patch
+++ b/sci-visualization/paraview/files/paraview-5.9.0-gcc11-include.patch
@@ -1,5 +1,3 @@
-diff --git a/VTK/Common/Core/vtkGenericDataArrayLookupHelper.h b/VTK/Common/Core/vtkGenericDataArrayLookupHelper.h
-index ab9d5724..202aaa27 100644
 --- a/VTK/Common/Core/vtkGenericDataArrayLookupHelper.h
 +++ b/VTK/Common/Core/vtkGenericDataArrayLookupHelper.h
 @@ -25,6 +25,7 @@
@@ -10,3 +8,13 @@ index ab9d5724..202aaa27 100644
  #include <unordered_map>
  #include <vector>
  
+--- a/VTK/Common/DataModel/vtkPiecewiseFunction.cxx
++++ b/VTK/Common/DataModel/vtkPiecewiseFunction.cxx
+@@ -22,6 +22,7 @@
+ #include <cassert>
+ #include <cmath>
+ #include <iterator>
++#include <limits>
+ #include <set>
+ #include <vector>
+ 


^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-visualization/paraview/files/
@ 2021-06-13 17:58 Sam James
  0 siblings, 0 replies; 5+ messages in thread
From: Sam James @ 2021-06-13 17:58 UTC (permalink / raw
  To: gentoo-commits

commit:     c3dc785bbc6000bc1ad0c48a10f3877404e046da
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 13 16:32:01 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Jun 13 17:13:52 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c3dc785b

sci-visualization/paraview: fix build for GCC 11

Closes: https://bugs.gentoo.org/789573
Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../files/paraview-5.9.0-gcc11-include.patch        | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/sci-visualization/paraview/files/paraview-5.9.0-gcc11-include.patch b/sci-visualization/paraview/files/paraview-5.9.0-gcc11-include.patch
index b9fad8c094f..d5850073fb9 100644
--- a/sci-visualization/paraview/files/paraview-5.9.0-gcc11-include.patch
+++ b/sci-visualization/paraview/files/paraview-5.9.0-gcc11-include.patch
@@ -1,3 +1,4 @@
+https://bugs.gentoo.org/789573
 --- a/VTK/Common/Core/vtkGenericDataArrayLookupHelper.h
 +++ b/VTK/Common/Core/vtkGenericDataArrayLookupHelper.h
 @@ -25,6 +25,7 @@
@@ -18,3 +19,23 @@
  #include <set>
  #include <vector>
  
+--- a/VTK/Rendering/Core/vtkColorTransferFunction.cxx
++++ b/VTK/Rendering/Core/vtkColorTransferFunction.cxx
+@@ -21,6 +21,7 @@
+ #include <algorithm>
+ #include <cmath>
+ #include <iterator>
++#include <limits>
+ #include <set>
+ #include <vector>
+ 
+--- a/VTK/Filters/HyperTree/vtkHyperTreeGridThreshold.cxx
++++ b/VTK/Filters/HyperTree/vtkHyperTreeGridThreshold.cxx
+@@ -27,6 +27,7 @@
+ #include "vtkHyperTreeGridNonOrientedCursor.h"
+ 
+ #include <cmath>
++#include <limits>
+ 
+ vtkStandardNewMacro(vtkHyperTreeGridThreshold);
+ 


^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-visualization/paraview/files/
@ 2021-09-21 18:26 Conrad Kostecki
  0 siblings, 0 replies; 5+ messages in thread
From: Conrad Kostecki @ 2021-09-21 18:26 UTC (permalink / raw
  To: gentoo-commits

commit:     3d2c9b890a5b03e535d6d0d8892519d6833b2e24
Author:     Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Tue Sep 21 17:03:05 2021 +0000
Commit:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Tue Sep 21 18:25:54 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3d2c9b89

sci-visualization/paraview: remove unused patches

Closes: https://github.com/gentoo/gentoo/pull/22358
Package-Manager: Portage-3.0.23, Repoman-3.0.3
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>

 .../files/paraview-5.3.0-fix_buildsystem.patch     | 24 --------------
 .../files/paraview-5.8.0-w-vtk-8.2.0-qt-5.15.patch | 37 ---------------------
 .../files/paraview-5.8.1-find-xmlpatterns.patch    | 38 ----------------------
 3 files changed, 99 deletions(-)

diff --git a/sci-visualization/paraview/files/paraview-5.3.0-fix_buildsystem.patch b/sci-visualization/paraview/files/paraview-5.3.0-fix_buildsystem.patch
deleted file mode 100644
index 600c7d43744..00000000000
--- a/sci-visualization/paraview/files/paraview-5.3.0-fix_buildsystem.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From dcc3d775bddc270aa1a4d06f85807979ab0c8358 Mon Sep 17 00:00:00 2001
-From: Matthias Maier <tamiko@kyomu.43-1.org>
-Date: Thu, 1 Jun 2017 02:27:16 -0500
-Subject: [PATCH] fix buildsystem
-
----
- VTK/Utilities/Doxygen/CMakeLists.txt | 3 ---
- 1 file changed, 3 deletions(-)
-
-diff --git a/VTK/Utilities/Doxygen/CMakeLists.txt b/VTK/Utilities/Doxygen/CMakeLists.txt
-index 3f285f6..7ebf3ee 100644
---- a/VTK/Utilities/Doxygen/CMakeLists.txt
-+++ b/VTK/Utilities/Doxygen/CMakeLists.txt
-@@ -80,7 +80,4 @@ if(NOT VTK_INSTALL_NO_DOCUMENTATION)
-   install(FILES doc_readme.txt
-     DESTINATION ${VTK_INSTALL_DOXYGEN_DIR}
-     COMPONENT Development)
--  install(DIRECTORY ${VTK_BINARY_DIR}/Utilities/Doxygen/doc/html
--      DESTINATION ${VTK_INSTALL_DOXYGEN_DIR}
--      COMPONENT Development)
- endif()
--- 
-2.13.0
-

diff --git a/sci-visualization/paraview/files/paraview-5.8.0-w-vtk-8.2.0-qt-5.15.patch b/sci-visualization/paraview/files/paraview-5.8.0-w-vtk-8.2.0-qt-5.15.patch
deleted file mode 100644
index 1f76b84ac2d..00000000000
--- a/sci-visualization/paraview/files/paraview-5.8.0-w-vtk-8.2.0-qt-5.15.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 797f28697d5ba50c1fa2bc5596af626a3c277826 Mon Sep 17 00:00:00 2001
-From: "Andrew J. P. Maclean" <andrew.amaclean@gmail.com>
-Date: Wed, 27 May 2020 15:27:15 +1000
-Subject: [PATCH] Qt 5.15 needs the include file QPainterPath
-
----
- Rendering/Qt/vtkQtLabelRenderStrategy.cxx | 1 +
- Rendering/Qt/vtkQtStringToImage.cxx       | 1 +
- 2 files changed, 2 insertions(+)
-
-diff --git a/VTK/Rendering/Qt/vtkQtLabelRenderStrategy.cxx b/VTK/Rendering/Qt/vtkQtLabelRenderStrategy.cxx
-index afda585cca..eca65c64cd 100644
---- a/VTK/Rendering/Qt/vtkQtLabelRenderStrategy.cxx
-+++ b/VTK/Rendering/Qt/vtkQtLabelRenderStrategy.cxx
-@@ -41,6 +41,7 @@
- #include <QImage>
- #include <QMap>
- #include <QPainter>
-+#include <QPainterPath>
- #include <QPair>
- #include <QPixmap>
- #include <QTextDocument>
-diff --git a/VTK/Rendering/Qt/vtkQtStringToImage.cxx b/VTK/Rendering/Qt/vtkQtStringToImage.cxx
-index 659c71570e..fbb9b78f05 100644
---- a/VTK/Rendering/Qt/vtkQtStringToImage.cxx
-+++ b/VTK/Rendering/Qt/vtkQtStringToImage.cxx
-@@ -30,6 +30,7 @@
- #include <QFontMetrics>
- #include <QImage>
- #include <QPainter>
-+#include <QPainterPath>
- #include <QPixmap>
- #include <QString>
- #include <QTextDocument>
--- 
-2.26.2
-

diff --git a/sci-visualization/paraview/files/paraview-5.8.1-find-xmlpatterns.patch b/sci-visualization/paraview/files/paraview-5.8.1-find-xmlpatterns.patch
deleted file mode 100644
index b02107bad7a..00000000000
--- a/sci-visualization/paraview/files/paraview-5.8.1-find-xmlpatterns.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 7fe2ebc709ecb3e7f3b2aa6fc124dda0622541d4 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Wed, 25 Nov 2020 16:32:56 +0100
-Subject: [PATCH] Make qt_xmlpatterns_executable overridable
-
-So far this relies on fragile guessing of path or binary being in PATH.
-
-Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
----
- CMake/ParaViewClient.cmake | 12 +++++++-----
- 1 file changed, 7 insertions(+), 5 deletions(-)
-
-diff --git a/CMake/ParaViewClient.cmake b/CMake/ParaViewClient.cmake
-index b0dea2b328..13b59cd744 100644
---- a/CMake/ParaViewClient.cmake
-+++ b/CMake/ParaViewClient.cmake
-@@ -512,11 +512,13 @@ function (paraview_client_documentation)
-   endif ()
- 
-   include("${_ParaViewClient_cmake_dir}/paraview-find-package-helpers.cmake" OPTIONAL)
--  find_program(qt_xmlpatterns_executable
--    NAMES xmlpatterns-qt5 xmlpatterns
--    HINTS "${Qt5_DIR}/../../../bin"
--          "${Qt5_DIR}/../../../libexec/qt5/bin"
--    DOC   "Path to xmlpatterns")
-+  if (NOT qt_xmlpatterns_executable)
-+    find_program(qt_xmlpatterns_executable
-+      NAMES xmlpatterns-qt5 xmlpatterns
-+      HINTS "${Qt5_DIR}/../../../bin"
-+            "${Qt5_DIR}/../../../libexec/qt5/bin"
-+      DOC   "Path to xmlpatterns")
-+  endif ()
-   mark_as_advanced(qt_xmlpatterns_executable)
- 
-   if (NOT qt_xmlpatterns_executable)
--- 
-2.29.2
-


^ permalink raw reply related	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2021-09-21 18:26 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-04-23  0:06 [gentoo-commits] repo/gentoo:master commit in: sci-visualization/paraview/files/ Matthias Maier
  -- strict thread matches above, loose matches on Subject: below --
2019-08-05  0:08 Matthias Maier
2021-05-11 22:04 Sam James
2021-06-13 17:58 Sam James
2021-09-21 18:26 Conrad Kostecki

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox