X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FParallelContainer%2FCMakeLists.txt;h=8c76334e50bc2b578d8af71fff51a753c35f4b50;hb=82668fe5e4d077072402d253497f96d4c53391f9;hp=f17c1e472ef14fb996942a2dd75424c83c9e09d7;hpb=5a898fa18674049bd3e02014ece2036709bd251a;p=modules%2Fkernel.git

diff --git a/src/ParallelContainer/CMakeLists.txt b/src/ParallelContainer/CMakeLists.txt
index f17c1e472..8c76334e5 100755
--- a/src/ParallelContainer/CMakeLists.txt
+++ b/src/ParallelContainer/CMakeLists.txt
@@ -1,9 +1,9 @@
-# Copyright (C) 2012  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2012-2016  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
@@ -22,22 +22,21 @@ INCLUDE_DIRECTORIES(
   ${MPI_CXX_INCLUDE_PATH}
   ${PYTHON_INCLUDE_DIRS}
   ${PACO_INCLUDE_DIRS}
-  ${CMAKE_BINARY_DIR}/salome_adm
-  ${CMAKE_SOURCE_DIR}/src/Container
-  ${CMAKE_SOURCE_DIR}/src/Notification
-  ${CMAKE_SOURCE_DIR}/src/SALOMELocalTrace
-  ${CMAKE_SOURCE_DIR}/src/Basics
-  ${CMAKE_SOURCE_DIR}/src/NamingService
-  ${CMAKE_SOURCE_DIR}/src/Registry
-  ${CMAKE_SOURCE_DIR}/src/Utils
-  ${CMAKE_SOURCE_DIR}/src/GenericObj
+  ${PROJECT_BINARY_DIR}/salome_adm
+  ${PROJECT_SOURCE_DIR}/src/Container
+  ${PROJECT_SOURCE_DIR}/src/Notification
+  ${PROJECT_SOURCE_DIR}/src/SALOMELocalTrace
+  ${PROJECT_SOURCE_DIR}/src/Basics
+  ${PROJECT_SOURCE_DIR}/src/NamingService
+  ${PROJECT_SOURCE_DIR}/src/Registry
+  ${PROJECT_SOURCE_DIR}/src/Utils
+  ${PROJECT_SOURCE_DIR}/src/GenericObj
   ${CMAKE_CURRENT_SOURCE_DIR}/../HDFPersist
-  ${CMAKE_BINARY_DIR}/idl
-  ${CMAKE_SOURCE_DIR}/src/SALOMETraceCollector
-  ${PACOPATH}/lib
+  ${PROJECT_BINARY_DIR}/idl
+  ${PROJECT_SOURCE_DIR}/src/SALOMETraceCollector
 )
 
-# This local variable defines the list of dependant libraries common to all target in this package.
+# This local variable defines the list of dependent libraries common to all target in this package.
 SET(COMMON_LIBS
   SalomeContainer
   SalomeNS
@@ -47,7 +46,7 @@ SET(COMMON_LIBS
   SalomeParallelIDLKernel
   SalomeIDLKernel
   ${OMNIORB_LIBRARIES}
-  ${PACO_LIBS}
+  ${PACO_LIBRARIES}
   ${PYTHON_LIBRARIES}
 )
 
@@ -59,34 +58,31 @@ SET(SalomeParallelContainer_SOURCES
   SALOME_ParallelGlobalProcessVar_i.cxx
 )
 
-ADD_DEFINITIONS(${ONMIORB_DEFINITIONS} ${MPI_CXX_COMPILE_FLAGS} ${PACO_DEFINITIONS})
+ADD_DEFINITIONS(${OMNIORB_DEFINITIONS} ${MPI_DEFINITIONS})
 
 ADD_LIBRARY(SalomeParallelContainer ${SalomeParallelContainer_SOURCES})
 TARGET_LINK_LIBRARIES(SalomeParallelContainer ${COMMON_LIBS} ${MPI_CXX_LIBRARIES})
-INSTALL(TARGETS Registry DESTINATION ${KERNEL_salomelib_LIBS})
+INSTALL(TARGETS SalomeParallelContainer EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_LIBS})
 
 IF(SALOME_USE_MPI)
   SET(SALOME_ParallelContainerProxyMpi_LIBS
     SalomeParallelContainer
-    ${PaCO_dummy}
-    ${PaCO_mpi}
-    ${PaCO_omnithread}
     ${MPI_CXX_LIBRARIES}
     ${COMMON_LIBS}
   )
-  ADD_EXECUTABLE(SALOME_ParallelContainerProxyMpi SALOME_Registry_Server.cxx)
+  ADD_EXECUTABLE(SALOME_ParallelContainerProxyMpi SALOME_ParallelContainerProxyMpi.cxx)
   TARGET_LINK_LIBRARIES(SALOME_ParallelContainerProxyMpi ${SALOME_ParallelContainerProxyMpi_LIBS})
 
   ADD_EXECUTABLE(SALOME_ParallelContainerNodeMpi SALOME_ParallelContainerNodeMpi.cxx)
   TARGET_LINK_LIBRARIES(SALOME_ParallelContainerNodeMpi ${SALOME_ParallelContainerProxyMpi_LIBS})
 
-  INSTALL(TARGETS SALOME_ParallelContainerProxyMpi SALOME_ParallelContainerNodeMpi DESTINATION ${KERNEL_salomebin_BINS})
+  INSTALL(TARGETS SALOME_ParallelContainerProxyMpi SALOME_ParallelContainerNodeMpi
+        EXPORT ${PROJECT_NAME}TargetGroup 
+        DESTINATION ${SALOME_INSTALL_BINS})
 ENDIF(SALOME_USE_MPI)
 
 SET(SALOME_ParallelContainerProxyDummy_LIBS
   SalomeParallelContainer
-  ${PaCO_dummy}
-  ${PaCO_omnithread}
   ${COMMON_LIBS}
 )
 
@@ -96,8 +92,8 @@ TARGET_LINK_LIBRARIES(SALOME_ParallelContainerProxyDummy ${SALOME_ParallelContai
 ADD_EXECUTABLE(SALOME_ParallelContainerNodeDummy SALOME_ParallelContainerNodeDummy.cxx)
 TARGET_LINK_LIBRARIES(SALOME_ParallelContainerNodeDummy ${SALOME_ParallelContainerProxyDummy_LIBS})
 
-INSTALL(TARGETS SALOME_ParallelContainerNodeDummy SALOME_ParallelContainerProxyDummy DESTINATION ${KERNEL_salomebin_BINS})
+INSTALL(TARGETS SALOME_ParallelContainerNodeDummy SALOME_ParallelContainerProxyDummy DESTINATION ${SALOME_INSTALL_BINS})
 
 FILE(GLOB COMMON_HEADERS_HXX "${CMAKE_CURRENT_SOURCE_DIR}/*.hxx")
-INSTALL(FILES ${COMMON_HEADERS_HXX} DESTINATION ${KERNEL_salomeinclude_HEADERS})
+INSTALL(FILES ${COMMON_HEADERS_HXX} DESTINATION ${SALOME_INSTALL_HEADERS})