-# Copyright (C) 2012 CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2012-2014 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
${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.
SalomeParallelIDLKernel
SalomeIDLKernel
${OMNIORB_LIBRARIES}
- ${PACO_LIBS}
+ ${PACO_LIBRARIES}
${PYTHON_LIBRARIES}
)
SALOME_ParallelGlobalProcessVar_i.cxx
)
-ADD_DEFINITIONS(${ONMIORB_DEFINITIONS} ${MPI_CXX_COMPILE_FLAGS} ${PACO_DEFINITIONS})
+ADD_DEFINITIONS(${ONMIORB_DEFINITIONS} ${MPI_CXX_COMPILE_FLAGS})
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}
)
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})