From 662fe0be08a1573864cd38f86b1a7e22378b783a Mon Sep 17 00:00:00 2001 From: vsr Date: Wed, 20 Mar 2019 08:56:59 +0300 Subject: [PATCH] Integration of [CEA 13233] support new xdr.h location - KERNEL in fact does not need xdr --- CMakeLists.txt | 1 - src/Communication/CMakeLists.txt | 1 - src/Communication/SALOME_Comm_i.cxx | 2 ++ 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 859864424..4d9e4039c 100755 --- 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 c65d0e19e..e9dc6440b 100755 --- 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 836f6ee8c..5018148ea 100644 --- 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 #endif #endif +#endif #include "omniORB4/poa.h" #include "omnithread.h" #include "Utils_SINGLETON.hxx" -- 2.39.2