spns #34373: cmake fails to find CGNS if embedded

diff --git a/products/ParaView.pyconf b/products/ParaView.pyconf
index 5b3df898c38fd91aa65bdc7bf6a597445133092e..e9108244d01451ff1067d20331cf452ac3b17c51 100755 (executable)
--- a/products/ParaView.pyconf
+++ b/products/ParaView.pyconf
@@ -35,6 +35,7 @@ version_5_11_1 :
     compil_script :  'ParaView-5.11.1.sh'
     archive_info : {archive_name : "ParaView-5.11.1.tar.gz"}
     patches : [
+               'paraview-5.11.1.p001-FindCGNS.patch'
               ]
     depend : [
               'Python',
@@ -56,8 +57,9 @@ version_5_11_1_int32 :
 {
     compil_script :  'ParaView-5.11.1.sh'
     archive_info : {archive_name : "ParaView-5.11.1.tar.gz"}
-    # two other LATA patches already included in archive
-    patches : []
+    patches : [
+               'paraview-5.11.1.p001-FindCGNS.patch'
+              ]
     depend : [
               'Python',
               'hdf5',
@@ -91,7 +93,9 @@ version_5_11_1_win :
               'zlib'
              ]
     opt_depend : ['openmpi', 'ospray','tbb', 'openturns', 'rkCommon', 'matplotlib']
-    patches : []
+    patches : [
+               'paraview-5.11.1.p001-FindCGNS.patch'
+              ]
 }
 
 version_5_11_1_win_dbg :
@@ -118,7 +122,9 @@ version_5_11_1_MPI :
 {
     compil_script :  'ParaView-5.11.1.sh'
     archive_info : {archive_name : "ParaView-5.11.1.tar.gz"}
-    patches : []
+    patches : [
+                'paraview-5.11.1.p001-FindCGNS.patch'
+              ]
     depend : [
               'Python',
               'hdf5',
@@ -139,7 +145,10 @@ version_5_11_1_MPI_LATA_64BITS_IDS :
 {
     compil_script :  'ParaView-5.11.1.sh'
     archive_info : {archive_name : "ParaView-5.11.1.tar.gz"}
-    patches : []
+    patches : [
+                 'paraview-5.11.1.p001-FindCGNS.patch',
+                 'paraview-0012-LATA_64BITS_IDS.patch'
+              ]
     depend : [
               'Python',
               'hdf5',

diff --git a/products/patches/paraview-5.11.1.p001-FindCGNS.patch b/products/patches/paraview-5.11.1.p001-FindCGNS.patch
new file mode 100644 (file)
index 0000000..e450f87
--- /dev/null
+++ b/products/patches/paraview-5.11.1.p001-FindCGNS.patch
@@ -0,0 +1,18 @@
+--- ParaView-5.11.1_ref/VTK/CMake/FindCGNS.cmake       2023-04-05 10:00:53.000000000 +0200
++++ ParaView-5.11.1_dev/VTK/CMake/FindCGNS.cmake       2023-04-12 09:26:23.659042547 +0200
+@@ -5,10 +5,15 @@
+ # CGNS_LIBRARIES   - List of fully qualified libraries to link against when using CGNS.
+ # CGNS_FOUND       - Do not attempt to use CGNS if "no" or undefined.
+ 
++SET(CGNS_ROOT_DIR $ENV{CGNS_ROOT_DIR} CACHE PATH "Path to the CGNS.")
++IF(CGNS_ROOT_DIR)
++ LIST(APPEND CMAKE_PREFIX_PATH "${CGNS_ROOT_DIR}")
++ENDIF(CGNS_ROOT_DIR)
+ find_path(CGNS_INCLUDE_DIR
+   NAMES
+     cgnslib.h
+   PATHS
++    ${CGNS_ROOT_DIR}/include
+     /usr/local/include
+     /usr/include
+   DOC "CGNS include directory")