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

[modules/kernel.git] / src / Communication / CMakeLists.txt

diff --git a/src/Communication/CMakeLists.txt b/src/Communication/CMakeLists.txt
index 796ffddedbe2150a4dddc025d7597c1bd7a80662..c65d0e19ee53cc8cd6a2afd049ddc2eed3b96342 100755 (executable)
--- a/src/Communication/CMakeLists.txt
+++ b/src/Communication/CMakeLists.txt
@@ -1,9 +1,9 @@
-# Copyright (C) 2012  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2012-2019  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
 # License as published by the Free Software Foundation; either
-# version 2.1 of the License.
+# version 2.1 of the License, or (at your option) any later version.
 #
 # This library is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -18,21 +18,24 @@
 #
 
 INCLUDE_DIRECTORIES(
-  ${PTHREAD_INCLUDE_DIRS}
-  ${OMNIORB_INCLUDE_DIRS}
-  ${MPI_INCLUDE_DIRS}
+  ${XDR_INCLUDE_DIR}
+  ${OMNIORB_INCLUDE_DIR}
+  ${PTHREAD_INCLUDE_DIR}
+  ${MPI_CXX_INCLUDE_PATH}
   ${PYTHON_INCLUDE_DIRS}
-  ${CMAKE_BINARY_DIR}/salome_adm
+  ${PROJECT_BINARY_DIR}/salome_adm
   ${CMAKE_CURRENT_SOURCE_DIR}/../Basics
   ${CMAKE_CURRENT_SOURCE_DIR}/../SALOMELocalTrace
   ${CMAKE_CURRENT_SOURCE_DIR}/../Utils
-  ${CMAKE_BINARY_DIR}/idl
+  ${PROJECT_BINARY_DIR}/idl
 )
 
 SET(COMMON_LIBS
   OpUtil
   SALOMELocalTrace
   SalomeIDLKernel
+  ${PYTHON_LIBRARIES}
+  ${MPI_CXX_LIBRARIES}
 )
 
 SET(SalomeCommunication_SOURCES
@@ -43,21 +46,13 @@ SET(SalomeCommunication_SOURCES
   SALOMEMultiComm.cxx
   ReceiverFactory.cxx
   MatrixClient.cxx
-  MultiCommException.hxx
-  SALOME_Comm_i.hxx
-  SALOME_Matrix_i.hxx
-  SenderFactory.hxx
-  ReceiverFactory.hxx
-  MatrixClient.hxx
-  SALOMEMultiComm.hxx
-  Receivers.hxx
-  Receiver.hxx
 )
 
-ADD_LIBRARY(SalomeCommunication SHARED ${SalomeCommunication_SOURCES})
-SET_TARGET_PROPERTIES(SalomeCommunication PROPERTIES COMPILE_FLAGS "${OMNIORB_DEFINITIONS} ${MPI_DEFINITIONS} ${PLATFORM_DEFINITIONS}")
-TARGET_LINK_LIBRARIES(SalomeCommunication ${COMMON_LIBS} ${PYTHON_LIBS} ${MPI_LIBS})
-INSTALL(TARGETS SalomeCommunication DESTINATION ${KERNEL_salomelib_LIBS})
+ADD_DEFINITIONS(${OMNIORB_DEFINITIONS} ${MPI_DEFINITIONS})
+
+ADD_LIBRARY(SalomeCommunication ${SalomeCommunication_SOURCES})
+TARGET_LINK_LIBRARIES(SalomeCommunication ${COMMON_LIBS})
+INSTALL(TARGETS SalomeCommunication EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_LIBS})
 
 SET(COMMON_HEADERS_HXX
   MatrixClient.hxx
@@ -65,7 +60,6 @@ SET(COMMON_HEADERS_HXX
   Receiver.hxx
   ReceiverFactory.hxx
   Receivers.hxx
-  Receivers.cxx
   SALOMEMultiComm.hxx
   SALOME_Comm_i.hxx
   SALOME_Communication.hxx
@@ -73,4 +67,4 @@ SET(COMMON_HEADERS_HXX
   SenderFactory.hxx
 )
 
-INSTALL(FILES ${COMMON_HEADERS_HXX} DESTINATION ${KERNEL_salomeinclude_HEADERS})
+INSTALL(FILES ${COMMON_HEADERS_HXX} DESTINATION ${SALOME_INSTALL_HEADERS})