products/patches/FindXDR-CO8.patch

   1 diff --git a/cmake_files/FindXDR.cmake b/cmake_files/FindXDR.cmake
   2 index e8e86253..d8b4bb7a 100644
   3 --- a/cmake_files/FindXDR.cmake
   4 +++ b/cmake_files/FindXDR.cmake
   5 @@ -21,8 +21,16 @@ MESSAGE(STATUS "Check for XDR ...")
   6
   7  FIND_PATH(XDR_INCLUDE_DIRS rpc/xdr.h)
   8  IF(XDR_INCLUDE_DIRS)
   9 -   SET(XDR_DEFINITIONS "-DHAS_XDR")
  10 -ENDIF()
  11 +  SET(XDR_DEFINITIONS "-DHAS_XDR")
  12 +ELSE(XDR_INCLUDE_DIRS)
  13 +  IF(EXISTS "/usr/include/tirpc/rpc/xdr.h")
  14 +    MESSAGE(STATUS "XDR was found in /usr/include/tirpc ...")
  15 +    include_directories(/usr/include/tirpc)
  16 +    SET(XDR_DEFINITIONS "-DHAS_XDR")
  17 +    SET(XDR_INCLUDE_DIRS "/usr/include/tirpc")
  18 +    FIND_LIBRARY(XDR_LIBRARIES tirpc xdr)
  19 +  ENDIF()
  20 +ENDIF(XDR_INCLUDE_DIRS)
  21
  22  IF(WIN32)
  23    FIND_LIBRARY(XDR_LIBRARIES xdr)                 # To get the .lib file from XDR
  24 diff --git a/src/INTERP_KERNELTest/CMakeLists.txt b/src/INTERP_KERNELTest/CMakeLists.txt
  25 index b63df2ac..d6178314 100644
  26 --- a/src/INTERP_KERNELTest/CMakeLists.txt
  27 +++ b/src/INTERP_KERNELTest/CMakeLists.txt
  28 @@ -81,12 +81,12 @@ IF(NOT MEDCOUPLING_MICROMED)
  29      PerfTest.cxx
  30      )
  31    ADD_EXECUTABLE(PerfTest ${PerfTest_SOURCES})
  32 -  TARGET_LINK_LIBRARIES(PerfTest InterpKernelTest ${CPPUNIT_LIBRARIES} ${PLATFORM_LIBS})
  33 +  TARGET_LINK_LIBRARIES(PerfTest InterpKernelTest ${CPPUNIT_LIBRARIES} ${PLATFORM_LIBS} ${XDR_LIBRARIES})
  34    INSTALL(TARGETS PerfTest DESTINATION ${MEDCOUPLING_INSTALL_BINS})
  35  ENDIF(NOT MEDCOUPLING_MICROMED)
  36
  37  ADD_LIBRARY(InterpKernelTestUtils ${InterpKernelTestUtils_SOURCES})
  38 -TARGET_LINK_LIBRARIES(InterpKernelTestUtils interpkernel)
  39 +TARGET_LINK_LIBRARIES(InterpKernelTestUtils interpkernel )
  40  ADD_LIBRARY(InterpKernelTest ${InterpKernelTest_SOURCES})
  41
  42  SET(InterpKernelTest_LIBS medcoupling interpkernel ${CPPUNIT_LIBRARIES})
  43 @@ -96,7 +96,7 @@ ENDIF(NOT MEDCOUPLING_MICROMED)
  44  TARGET_LINK_LIBRARIES(InterpKernelTest ${InterpKernelTest_LIBS} InterpKernelTestUtils)
  45
  46  ADD_EXECUTABLE(TestINTERP_KERNEL ${TestINTERP_KERNEL_SOURCES})
  47 -TARGET_LINK_LIBRARIES(TestINTERP_KERNEL InterpKernelTest ${CPPUNIT_LIBRARIES} ${PLATFORM_LIBS})
  48 +TARGET_LINK_LIBRARIES(TestINTERP_KERNEL InterpKernelTest ${CPPUNIT_LIBRARIES} ${PLATFORM_LIBS}  ${XDR_LIBRARIES})
  49  ADD_TEST(TestINTERP_KERNEL TestINTERP_KERNEL)
  50  SALOME_GENERATE_TESTS_ENVIRONMENT(tests_env)
  51  SET_TESTS_PROPERTIES(TestINTERP_KERNEL PROPERTIES ENVIRONMENT "${tests_env}")
  52 diff --git a/src/MEDLoader/CMakeLists.txt b/src/MEDLoader/CMakeLists.txt
  53 index 6d0ed57c..9ea3b7b6 100644
  54 --- a/src/MEDLoader/CMakeLists.txt
  55 +++ b/src/MEDLoader/CMakeLists.txt
  56 @@ -39,6 +39,7 @@ IF(WIN32)
  57    ENDIF(MEDCOUPLING_MEDLOADER_USE_XDR)
  58  ELSE(WIN32)
  59    SET(MEDLOADER_XDR_INCLUDE_DIRS ${XDR_INCLUDE_DIRS})
  60 +    SET(MEDLOADER_XDR_LIBRARIES ${XDR_LIBRARIES})
  61  ENDIF(WIN32)
  62
  63  INCLUDE_DIRECTORIES(
  64 diff --git a/src/MEDLoader/Test/CMakeLists.txt b/src/MEDLoader/Test/CMakeLists.txt
  65 index a230e8e5..36640deb 100644
  66 --- a/src/MEDLoader/Test/CMakeLists.txt
  67 +++ b/src/MEDLoader/Test/CMakeLists.txt
  68 @@ -42,13 +42,13 @@ SET(TestSauvLoader_SOURCES
  69  SALOME_GENERATE_TESTS_ENVIRONMENT(tests_env)
  70
  71  ADD_EXECUTABLE(TestMEDLoader ${TestMEDLoader_SOURCES})
  72 -TARGET_LINK_LIBRARIES(TestMEDLoader medloader InterpKernelTestUtils ${CPPUNIT_LIBRARIES} ${PLATFORM_LIBS})
  73 +TARGET_LINK_LIBRARIES(TestMEDLoader medloader InterpKernelTestUtils ${CPPUNIT_LIBRARIES} ${PLATFORM_LIBS} ${XDR_LIBRARIES})
  74  ADD_TEST(TestMEDLoader TestMEDLoader)
  75  SET_TESTS_PROPERTIES(TestMEDLoader PROPERTIES ENVIRONMENT "${tests_env}")
  76
  77  ADD_EXECUTABLE(TestSauvLoader ${TestSauvLoader_SOURCES})
  78
  79 -TARGET_LINK_LIBRARIES(TestSauvLoader medloader InterpKernelTestUtils ${CPPUNIT_LIBRARIES} ${PLATFORM_LIBS})
  80 +TARGET_LINK_LIBRARIES(TestSauvLoader medloader InterpKernelTestUtils ${CPPUNIT_LIBRARIES} ${PLATFORM_LIBS}  ${XDR_LIBRARIES})
  81  ADD_TEST(TestSauvLoader TestSauvLoader)
  82  SET_TESTS_PROPERTIES(TestSauvLoader PROPERTIES ENVIRONMENT "${tests_env}")
  83