add method NameChanged to update title name

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

diff --git a/src/MPIContainer/CMakeLists.txt b/src/MPIContainer/CMakeLists.txt
index 89011806004bbbf88f5c3ef6cf9b0fa7c987d80c..da204e055025104a9b2fb7d8f1e9d5900e7150fe 100755 (executable)
--- a/src/MPIContainer/CMakeLists.txt
+++ b/src/MPIContainer/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
@@ -18,10 +18,11 @@
 #
 
 INCLUDE_DIRECTORIES(
-  ${MPI_INCLUDE_DIRS}
+  ${MPI_CXX_INCLUDE_PATH}
+  ${PTHREAD_INCLUDE_DIR}
   ${PYTHON_INCLUDE_DIRS}
-  ${OMNIORB_INCLUDE_DIRS}
-  ${CMAKE_BINARY_DIR}/salome_adm
+  ${OMNIORB_INCLUDE_DIR}
+  ${PROJECT_BINARY_DIR}/salome_adm
   ${CMAKE_CURRENT_SOURCE_DIR}/../Basics
   ${CMAKE_CURRENT_SOURCE_DIR}/../SALOMELocalTrace
   ${CMAKE_CURRENT_SOURCE_DIR}/../NamingService
@@ -31,7 +32,7 @@ INCLUDE_DIRECTORIES(
   ${CMAKE_CURRENT_SOURCE_DIR}/../ResourcesManager
   ${CMAKE_CURRENT_SOURCE_DIR}/../Container
   ${CMAKE_CURRENT_SOURCE_DIR}/../GenericObj
-  ${CMAKE_BINARY_DIR}/idl
+  ${PROJECT_BINARY_DIR}/idl
 )
 
 SET(COMMON_LIBS
@@ -45,25 +46,29 @@ SET(COMMON_LIBS
   SalomeContainer
   SalomeGenericObj
   SalomeIDLKernel
-  ${CORBA_LIBS}
+  ${OMNIORB_LIBRARIES}
 )
 
-ADD_LIBRARY(SalomeMPIContainer SHARED MPIObject_i.cxx MPIContainer_i.cxx)
-SET_TARGET_PROPERTIES(SalomeMPIContainer PROPERTIES COMPILE_FLAGS "${MPI_DEFINITIONS} ${OMNIORB_DEFINITIONS}")
+ADD_DEFINITIONS(${MPI_DEFINITIONS} ${OMNIORB_DEFINITIONS})
+
+ADD_LIBRARY(SalomeMPIContainer MPIObject_i.cxx MPIContainer_i.cxx)
 TARGET_LINK_LIBRARIES(SalomeMPIContainer ${COMMON_LIBS})
-INSTALL(TARGETS SalomeMPIContainer DESTINATION ${KERNEL_salomelib_LIBS})
+INSTALL(TARGETS SalomeMPIContainer EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_LIBS})
 
 ADD_EXECUTABLE(SALOME_MPIContainer SALOME_MPIContainer.cxx)
-SET_TARGET_PROPERTIES(SALOME_MPIContainer PROPERTIES COMPILE_FLAGS "${MPI_DEFINITIONS} ${OMNIORB_DEFINITIONS}")
-TARGET_LINK_LIBRARIES(SALOME_MPIContainer SalomeMPIContainer ${COMMON_LIBS} ${PYTHON_LIBS} ${MPI_LIBS})
+TARGET_LINK_LIBRARIES(SALOME_MPIContainer SalomeMPIContainer ${COMMON_LIBS} ${PYTHON_LIBRARIES} ${MPI_CXX_LIBRARIES})
 
 ADD_EXECUTABLE(testMPI2 testMPI2.cxx)
-SET_TARGET_PROPERTIES(testMPI2 PROPERTIES COMPILE_FLAGS "${MPI_DEFINITIONS}")
-TARGET_LINK_LIBRARIES(testMPI2 ${MPI_LIBS})
+TARGET_LINK_LIBRARIES(testMPI2 ${MPI_CXX_LIBRARIES})
+
+ADD_EXECUTABLE(getMPIImplementation getMPIImplementation.cxx)
+TARGET_LINK_LIBRARIES(getMPIImplementation ${MPI_CXX_LIBRARIES})
 
-INSTALL(TARGETS SALOME_MPIContainer testMPI2 DESTINATION ${KERNEL_salomebin_BINS})
+INSTALL(TARGETS SALOME_MPIContainer EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_BINS})
+INSTALL(TARGETS testMPI2 DESTINATION ${SALOME_INSTALL_BINS}) 
+INSTALL(TARGETS getMPIImplementation DESTINATION ${SALOME_INSTALL_BINS})
 
-INSTALL(FILES launch_testMPI2.csh DESTINATION ${KERNEL_salomescript_SCRIPTS})
+INSTALL(FILES launch_testMPI2.csh PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE DESTINATION ${SALOME_INSTALL_SCRIPT_SCRIPTS})
 
 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})