products/patches/MEDCOUPLING-V7_8_BR-findXdr-CO9.patch

   1 diff --git a/cmake_files/FindXDR.cmake b/cmake_files/FindXDR.cmake
   2 index e8e86253..6e24b6fe 100644
   3 --- a/cmake_files/FindXDR.cmake
   4 +++ b/cmake_files/FindXDR.cmake
   5 @@ -1,4 +1,4 @@
   6 -# Copyright (C) 2007-2016  CEA/DEN, EDF R&D, OPEN CASCADE
   7 +# Copyright (C) 2007-2024  CEA, EDF, OPEN CASCADE
   8  #
   9  # This library is free software; you can redistribute it and/or
  10  # modify it under the terms of the GNU Lesser General Public
  11 @@ -18,11 +18,11 @@
  12  #
  13
  14  MESSAGE(STATUS "Check for XDR ...")
  15 -
  16 -FIND_PATH(XDR_INCLUDE_DIRS rpc/xdr.h)
  17 +INCLUDE(FindPackageHandleStandardArgs)
  18 +FIND_PATH(XDR_INCLUDE_DIRS rpc/xdr.h PATH_SUFFIXES tirpc)
  19  IF(XDR_INCLUDE_DIRS)
  20 -   SET(XDR_DEFINITIONS "-DHAS_XDR")
  21 -ENDIF()
  22 +  SET(XDR_DEFINITIONS "-DHAS_XDR")
  23 +ENDIF(XDR_INCLUDE_DIRS)
  24
  25  IF(WIN32)
  26    FIND_LIBRARY(XDR_LIBRARIES xdr)                 # To get the .lib file from XDR
  27 @@ -34,7 +34,14 @@ IF(WIN32)
  28        SET(XDR_INCLUDE_DIRS "${XDR_INCLUDE_DIRS2}")  # Make the detection fail
  29      ENDIF()
  30    ENDIF()
  31 +  FIND_PACKAGE_HANDLE_STANDARD_ARGS(XDR REQUIRED_VARS XDR_INCLUDE_DIRS XDR_LIBRARIES)
  32 +ELSE(WIN32)
  33 +  FIND_LIBRARY(XDR_LIBRARY NAMES tirpc xdr)
  34 +  IF(NOT XDR_LIBRARY)
  35 +    MESSAGE(STATUS "Could not find XDR libraries ...")
  36 +  ELSE()
  37 +    MESSAGE(STATUS "Found XDR libraries ${XDR_LIBRARY} ...")
  38 +    SET(XDR_LIBRARIES ${XDR_LIBRARY})
  39 +  ENDIF()
  40 +  FIND_PACKAGE_HANDLE_STANDARD_ARGS(XDR REQUIRED_VARS XDR_INCLUDE_DIRS)
  41  ENDIF(WIN32)
  42 -
  43 -INCLUDE(FindPackageHandleStandardArgs)
  44 -FIND_PACKAGE_HANDLE_STANDARD_ARGS(XDR REQUIRED_VARS XDR_INCLUDE_DIRS)
  45 diff --git a/src/MEDCoupling_Swig/MEDCouplingMemArray.i b/src/MEDCoupling_Swig/MEDCouplingMemArray.i
  46 index f2303876..15c5d36e 100644
  47 --- a/src/MEDCoupling_Swig/MEDCouplingMemArray.i
  48 +++ b/src/MEDCoupling_Swig/MEDCouplingMemArray.i
  49 @@ -2933,7 +2933,7 @@ namespace ParaMEDMEM
  50                  if(PyInt_Check(nbOfTuples))
  51                    {
  52                      int nbOfTuples1=PyInt_AS_LONG(nbOfTuples);
  53 -                    if(nbOfTuples<0)
  54 +                    if( nbOfTuples1 < 0)
  55                        throw INTERP_KERNEL::Exception("DataArrayInt::setValue : should be a positive set of allocated memory !");
  56                      if(nbOfComp)
  57                        {
  58 diff --git a/src/MEDLoader/CMakeLists.txt b/src/MEDLoader/CMakeLists.txt
  59 index 6d0ed57c..b6dae338 100644
  60 --- a/src/MEDLoader/CMakeLists.txt
  61 +++ b/src/MEDLoader/CMakeLists.txt
  62 @@ -38,10 +38,12 @@ IF(WIN32)
  63      SET(MEDLOADER_XDR_LIBRARIES ${XDR_LIBRARIES})
  64    ENDIF(MEDCOUPLING_MEDLOADER_USE_XDR)
  65  ELSE(WIN32)
  66 +  SET(MEDLOADER_XDR_LIBRARIES ${XDR_LIBRARIES})
  67    SET(MEDLOADER_XDR_INCLUDE_DIRS ${XDR_INCLUDE_DIRS})
  68  ENDIF(WIN32)
  69
  70  INCLUDE_DIRECTORIES(
  71 +  ${XDR_INCLUDE_DIR}
  72    ${MEDFILE_INCLUDE_DIRS}
  73    ${HDF5_INCLUDE_DIRS}
  74    ${MEDLOADER_XDR_INCLUDE_DIRS}