Merge from V6_main 11/02/2013

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

diff --git a/src/TestMPIContainer/CMakeLists.txt b/src/TestMPIContainer/CMakeLists.txt
index 65038b42f2bb495317f83c09db475367a40aa7ad..8380cb94231142128a18e95b2491853efb23b106 100755 (executable)
--- a/src/TestMPIContainer/CMakeLists.txt
+++ b/src/TestMPIContainer/CMakeLists.txt
@@ -18,8 +18,8 @@
 #
 
 INCLUDE_DIRECTORIES(
-  ${MPI_INCLUDE_DIRS}
-  ${OMNIORB_INCLUDE_DIRS}
+  ${MPI_CXX_INCLUDE_PATH}
+  ${OMNIORB_INCLUDE_DIR}
   ${CMAKE_BINARY_DIR}/salome_adm
   ${CMAKE_CURRENT_SOURCE_DIR}/../Basics
   ${CMAKE_CURRENT_SOURCE_DIR}/../SALOMELocalTrace
@@ -34,7 +34,7 @@ INCLUDE_DIRECTORIES(
   ${CMAKE_BINARY_DIR}/idl
 )
 
-SET(COMMON_FLAGS "${OMNIORB_DEFINITIONS} ${MPI_DEFINITIONS}")
+ADD_DEFINITIONS(${OMNIORB_DEFINITIONS} ${MPI_CXX_COMPILE_FLAGS})
 
 SET(COMMON_LIBS
   Registry
@@ -48,17 +48,15 @@ SET(COMMON_LIBS
   SalomeMPIContainer
   SalomeGenericObj
   SalomeIDLKernel
-  ${OMNIORB_LIBS}
+  ${OMNIORB_LIBRARIES}
 )
 
-ADD_LIBRARY(SalomeTestMPIComponentEngine SHARED TestMPIComponentEngine.cxx)
-SET_TARGET_PROPERTIES(SalomeTestMPIComponentEngine PROPERTIES COMPILE_FLAGS "${COMMON_FLAGS}")
+ADD_LIBRARY(SalomeTestMPIComponentEngine TestMPIComponentEngine.cxx)
 TARGET_LINK_LIBRARIES(SalomeTestMPIComponentEngine ${COMMON_LIBS})
 INSTALL(TARGETS SalomeTestMPIComponentEngine DESTINATION ${KERNEL_salomelib_LIBS})
 
 ADD_EXECUTABLE(TestMPIContainer TestMPIContainer.cxx)
-SET_TARGET_PROPERTIES(TestMPIContainer PROPERTIES COMPILE_FLAGS "${COMMON_FLAGS}")
-TARGET_LINK_LIBRARIES(TestMPIContainer SalomeTestMPIComponentEngine ${COMMON_LIBS} ${MPI_LIBS})
+TARGET_LINK_LIBRARIES(TestMPIContainer SalomeTestMPIComponentEngine ${COMMON_LIBS} ${MPI_CXX_LIBRARIES})
 INSTALL(TARGETS TestMPIContainer DESTINATION ${KERNEL_salomebin_BINS})
 
 FILE(GLOB COMMON_HEADERS_HXX "${CMAKE_CURRENT_SOURCE_DIR}/*.hxx")