spns #32926: backport KERNEL & CONFIGURATION fixes on more recent platforms to ensure...

diff --git a/products/CONFIGURATION.pyconf b/products/CONFIGURATION.pyconf
index 40405160964ac66a40fecf5a74b1ee3beb439c70..0eb78288d54e45d2d83cc13fa6f03689b4f7cd53 100755 (executable)
--- a/products/CONFIGURATION.pyconf
+++ b/products/CONFIGURATION.pyconf
@@ -30,3 +30,8 @@ version_V9_9_0_FD36 :
 {
   patches: ['SPNS-29988-CONFIGURATION-V9_9_0.patch']
 }
+
+version_v9_2_0_CO8 :
+{
+  patches: ['SPNS-32926-CONFIGURATION-V9_2_0.FindXDR.patch']
+}

diff --git a/products/KERNEL.pyconf b/products/KERNEL.pyconf
index 49de209680cc9ae5850a17ae3c8b09705807a539..093c7b980ea2ff2dc7bd2646ec9006c7982e3bde 100644 (file)
--- a/products/KERNEL.pyconf
+++ b/products/KERNEL.pyconf
@@ -41,6 +41,7 @@ default :
         has_unit_tests
         incremental : "yes"
     }
+    patches: []
 }
 
 default_win :
@@ -148,6 +149,30 @@ version_V9_9_0_MPI :
               ]
 }
 
+version_V9_2_0 :
+{
+    cmake_options : "-DSALOME_USE_LIBBATCH=ON -DSWIG_EXECUTABLE=${SWIG_ROOT_DIR}/bin/swig -DSALOME_CMAKE_DEBUG=ON "
+    depend : ["Python",
+              "boost",
+              "cppunit",
+              "numpy",
+              "lapack",
+              "hdf5",
+              "omniORB",
+              "omniORBpy",
+              "docutils",
+              "libxml2",
+              "Sphinx",
+              "sphinxintl",
+              "Jinja2",
+              "setuptools",
+              "Pygments",
+              "pytz",
+              "LIBBATCH"
+              ]
+    patches: []
+}
+
 version_V8_5_0_to_V9_6_0:
 {
     cmake_options : "-DSALOME_USE_LIBBATCH=ON -DSWIG_EXECUTABLE=${SWIG_ROOT_DIR}/bin/swig -DSALOME_CMAKE_DEBUG=ON "

diff --git a/products/patches/SPNS-32926-CONFIGURATION-V9_2_0.FindXDR.patch b/products/patches/SPNS-32926-CONFIGURATION-V9_2_0.FindXDR.patch
new file mode 100644 (file)
index 0000000..fd5cfbd
--- /dev/null
+++ b/products/patches/SPNS-32926-CONFIGURATION-V9_2_0.FindXDR.patch
@@ -0,0 +1,28 @@
+diff --git a/cmake/FindXDR.cmake b/cmake/FindXDR.cmake
+index e8e8625..52f2de9 100644
+--- a/cmake/FindXDR.cmake
++++ b/cmake/FindXDR.cmake
+@@ -19,7 +19,7 @@
+ 
+ MESSAGE(STATUS "Check for XDR ...")
+ 
+-FIND_PATH(XDR_INCLUDE_DIRS rpc/xdr.h)
++FIND_PATH(XDR_INCLUDE_DIRS rpc/xdr.h PATH_SUFFIXES tirpc)
+ IF(XDR_INCLUDE_DIRS)
+    SET(XDR_DEFINITIONS "-DHAS_XDR")
+ ENDIF()
+@@ -34,6 +34,14 @@ IF(WIN32)
+       SET(XDR_INCLUDE_DIRS "${XDR_INCLUDE_DIRS2}")  # Make the detection fail
+     ENDIF()
+   ENDIF()
++ELSE(WIN32)
++  FIND_LIBRARY(XDR_LIBRARIES NAMES tirpc xdr)
++  IF(NOT XDR_LIBRARIES)
++    MESSAGE(STATUS  "Could not find XDR libraries ...")
++    SET(XDR_LIBRARIES) # reset variable tough
++  ELSE()
++    MESSAGE(STATUS "Found XDR libraries ${XDR_LIBRARIES} ...")
++  ENDIF()
+ ENDIF(WIN32)
+ 
+ INCLUDE(FindPackageHandleStandardArgs)

diff --git a/products/patches/SPNS-32926-KERNEL-V9_2_0.FindXDR.patch b/products/patches/SPNS-32926-KERNEL-V9_2_0.FindXDR.patch
new file mode 100644 (file)
index 0000000..ecd569d
--- /dev/null
+++ b/products/patches/SPNS-32926-KERNEL-V9_2_0.FindXDR.patch
@@ -0,0 +1,25 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index bd02fc5b5..c3da8a99e 100755
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -92,7 +92,7 @@ FIND_PACKAGE(SalomeSWIG REQUIRED)
+ FIND_PACKAGE(SalomeLibXml2 REQUIRED)
+ FIND_PACKAGE(SalomeHDF5 REQUIRED COMPONENTS C)
+ FIND_PACKAGE(SalomeBoost REQUIRED)
+-
++FIND_PACKAGE(SalomeXDR   REQUIRED)
+ # Optional prerequisites
+ # ======================
+ 
+diff --git a/src/Communication/CMakeLists.txt b/src/Communication/CMakeLists.txt
+index 643dd6f4b..c57270285 100755
+--- a/src/Communication/CMakeLists.txt
++++ b/src/Communication/CMakeLists.txt
+@@ -27,6 +27,7 @@ INCLUDE_DIRECTORIES(
+   ${CMAKE_CURRENT_SOURCE_DIR}/../SALOMELocalTrace
+   ${CMAKE_CURRENT_SOURCE_DIR}/../Utils
+   ${PROJECT_BINARY_DIR}/idl
++  ${XDR_INCLUDE_DIRS}
+ )
+ 
+ SET(COMMON_LIBS