Integration of [CEA 13233] support new xdr.h location

- KERNEL in fact does not need xdr

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 85986442443fa9f0297d85a1a5799a6334757c1f..4d9e4039cda5a71fc0f4bf5f28d261fd428defe0 100755 (executable)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -92,7 +92,6 @@ 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 c65d0e19ee53cc8cd6a2afd049ddc2eed3b96342..e9dc6440b60e0443688e3f9279cc44b484d56e57 100755 (executable)
--- a/src/Communication/CMakeLists.txt
+++ b/src/Communication/CMakeLists.txt
@@ -18,7 +18,6 @@
 #
 
 INCLUDE_DIRECTORIES(
-  ${XDR_INCLUDE_DIR}
   ${OMNIORB_INCLUDE_DIR}
   ${PTHREAD_INCLUDE_DIR}
   ${MPI_CXX_INCLUDE_PATH}

diff --git a/src/Communication/SALOME_Comm_i.cxx b/src/Communication/SALOME_Comm_i.cxx
index 836f6ee8c918d0ffb0411ce883ee9831602be699..5018148ea49aeeb0c3cefc7c512681cbf21cab60 100644 (file)
--- a/src/Communication/SALOME_Comm_i.cxx
+++ b/src/Communication/SALOME_Comm_i.cxx
@@ -23,9 +23,11 @@
 #include "SALOME_Comm_i.hxx"
 #ifndef WIN32
 #ifndef __APPLE__
+#ifdef HAVE_SOCKET
 #include <rpc/xdr.h>
 #endif
 #endif
+#endif
 #include "omniORB4/poa.h"
 #include "omnithread.h"
 #include "Utils_SINGLETON.hxx"