New CMake procedure.

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

diff --git a/src/Container/CMakeLists.txt b/src/Container/CMakeLists.txt
index b6b654456ed587450d10ba4bdfe3fbf6d6996233..b6e1aa077819702b90a6a9ebdd963875eaee7e09 100755 (executable)
--- a/src/Container/CMakeLists.txt
+++ b/src/Container/CMakeLists.txt
@@ -18,8 +18,8 @@
 #
 
 INCLUDE_DIRECTORIES(
-  ${PTHREAD_INCLUDE_DIRS}
   ${OMNIORB_INCLUDE_DIR}
+  ${PTHREAD_INCLUDE_DIR}
   ${HDF5_INCLUDE_DIRS}
   ${LIBXML2_INCLUDE_DIR}
   ${PYTHON_INCLUDE_DIRS}
@@ -67,13 +67,13 @@ IF(WITH_MPI_SEQ_CONTAINER)
   )
 ENDIF(WITH_MPI_SEQ_CONTAINER)
 
-IF(WITH_PACO_PARALLEL)
+IF(SALOME_PACO_PARALLEL)
   ADD_DEFINITIONS(-DWITH_PACO_PARALLEL ${PACO_DEFINITIONS})
   SET(COMMON_LIBS
     ${COMMON_LIBS}
     ${PACO_LIBS}
   )
-ENDIF(WITH_PACO_PARALLEL)
+ENDIF()
 
 SET(SalomeContainer_SOURCES
   Component_i.cxx
@@ -86,26 +86,27 @@ SET(SalomeContainer_SOURCES
 )
 
 ADD_LIBRARY(SalomeContainer ${SalomeContainer_SOURCES})
-TARGET_LINK_LIBRARIES(SalomeContainer ${COMMON_LIBS})
-INSTALL(TARGETS SalomeContainer DESTINATION ${KERNEL_salomelib_LIBS})
+TARGET_LINK_LIBRARIES(SalomeContainer ${COMMON_LIBS} ${PTHREAD_LIBRARIES})
+INSTALL(TARGETS SalomeContainer DESTINATION ${SALOME_INSTALL_LIBS})
 
 SET(SALOME_Container_LIBS
   SalomeContainer
   SALOMEBasics
   ${COMMON_LIBS}
   ${HDF5_LIBRARIES}
+  ${MPI_LIBRARIES}
 )
 
 ADD_EXECUTABLE(SALOME_Container SALOME_Container.cxx SALOME_Container_SignalsHandler.cxx)
 TARGET_LINK_LIBRARIES(SALOME_Container ${SALOME_Container_LIBS})
 
-IF(SALOME_USE_TEST)
+IF(SALOME_BUILD_TESTS)
   ADD_EXECUTABLE(TestSalome_file TestSalome_file.cxx)
   TARGET_LINK_LIBRARIES(TestSalome_file SALOMETraceCollectorTest ${SALOME_Container_LIBS})
-ENDIF(SALOME_USE_TEST)
-INSTALL(TARGETS SALOME_Container DESTINATION ${KERNEL_salomebin_BINS})
+ENDIF()
+INSTALL(TARGETS SALOME_Container DESTINATION ${SALOME_INSTALL_BINS})
 
 # Executable scripts to be installed
-SALOME_INSTALL_SCRIPTS("${SCRIPTS}" ${KERNEL_salomescript_PYTHON})
+SALOME_INSTALL_SCRIPTS("${SCRIPTS}" ${SALOME_INSTALL_SCRIPT_PYTHON})
 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})