Merge from V6_main 11/02/2013

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

diff --git a/src/Communication_SWIG/CMakeLists.txt b/src/Communication_SWIG/CMakeLists.txt
index 8683fa5bdb7c8f7f893f070fd9a4974335bfd59f..6741aa09b925de86cfc4b8bd80e6d10d5319f9ed 100755 (executable)
--- a/src/Communication_SWIG/CMakeLists.txt
+++ b/src/Communication_SWIG/CMakeLists.txt
@@ -17,7 +17,6 @@
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 
-FIND_PACKAGE(SWIG REQUIRED)
 INCLUDE(${SWIG_USE_FILE})
 
 SET_SOURCE_FILES_PROPERTIES(libSALOME_Comm.i PROPERTIES CPLUSPLUS ON)
@@ -25,7 +24,7 @@ SET_SOURCE_FILES_PROPERTIES(libSALOME_Comm.i PROPERTIES SWIG_DEFINITIONS "-shado
 
 INCLUDE_DIRECTORIES(
   ${PYTHON_INCLUDE_DIRS}
-  ${OMNIORB_INCLUDE_DIRS}
+  ${OMNIORB_INCLUDE_DIR}
   ${CMAKE_BINARY_DIR}/salome_adm
   ${CMAKE_CURRENT_SOURCE_DIR}
   ${CMAKE_CURRENT_SOURCE_DIR}/../Communication
@@ -34,29 +33,29 @@ INCLUDE_DIRECTORIES(
   ${CMAKE_CURRENT_SOURCE_DIR}/../Utils
   ${CMAKE_BINARY_DIR}/idl
 )
-SET(_libSALOME_Comm_FLAGS "${OMNIORB_DEFINITIONS} ${PLATFORM_DEFINITIONS}")
+
+ADD_DEFINITIONS(${OMNIORB_DEFINITIONS})
 SET(_libSALOME_Comm_LIBS
   SalomeCommunication
-  ${PYTHON_LIBS}
+  ${PYTHON_LIBRARIES}
 )
 
-IF(MPI_IS_OK)
-  INCLUDE_DIRECTORIES(${MPI_INCLUDE_DIRS})
+IF(SALOME_USE_MPI)
+  INCLUDE_DIRECTORIES(${MPI_CXX_INCLUDE_PATH})
 
-  SET(_libSALOME_Comm_FLAGS "${_libSALOME_Comm_FLAGS} ${MPI_DEFINITIONS}") 
+  ADD_DEFINITIONS(${MPI_CXX_COMPILE_FLAGS}) 
   SET(_libSALOME_Comm_LIBS
     ${_libSALOME_Comm_LIBS}
-    ${MPI_LIBS}
+    ${MPI_CXX_LIBRARIES}
   )
-ENDIF(MPI_IS_OK)
+ENDIF(SALOME_USE_MPI)
 
 SWIG_ADD_MODULE(libSALOME_Comm python libSALOME_Comm.i)
 SWIG_LINK_LIBRARIES(libSALOME_Comm ${_libSALOME_Comm_LIBS})
-SET_TARGET_PROPERTIES(_libSALOME_Comm PROPERTIES COMPILE_FLAGS "${_libSALOME_Comm_FLAGS}")
 
 IF(${MACHINE} STREQUAL WINDOWS)
   SET_TARGET_PROPERTIES(_libSALOME_Comm PROPERTIES DEBUG_OUTPUT_NAME _libSALOME_Comm_d)
 ENDIF(${MACHINE} STREQUAL WINDOWS)
 
 INSTALL(TARGETS _libSALOME_Comm DESTINATION ${KERNEL_salomepythondir})
-INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/libSALOME_Comm.py DESTINATION ${KERNEL_salomepythondir})
\ No newline at end of file
+INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/libSALOME_Comm.py DESTINATION ${KERNEL_salomepythondir})