X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FParallelContainer%2FCMakeLists.txt;h=8c76334e50bc2b578d8af71fff51a753c35f4b50;hb=82668fe5e4d077072402d253497f96d4c53391f9;hp=390d8d1a8f90a2f31348cae9bf7a81a53ec2eb63;hpb=c8b7536aa35c3d820b9556ae01f93edd6fa8bdc3;p=modules%2Fkernel.git diff --git a/src/ParallelContainer/CMakeLists.txt b/src/ParallelContainer/CMakeLists.txt index 390d8d1a8..8c76334e5 100755 --- a/src/ParallelContainer/CMakeLists.txt +++ b/src/ParallelContainer/CMakeLists.txt @@ -1,9 +1,9 @@ -# Copyright (C) 2012-2013 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 @@ -34,10 +34,9 @@ INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_SOURCE_DIR}/../HDFPersist ${PROJECT_BINARY_DIR}/idl ${PROJECT_SOURCE_DIR}/src/SALOMETraceCollector - ${PACOPATH}/lib ) -# This local variable defines the list of dependant libraries common to all target in this package. +# This local variable defines the list of dependent libraries common to all target in this package. SET(COMMON_LIBS SalomeContainer SalomeNS @@ -47,7 +46,7 @@ SET(COMMON_LIBS SalomeParallelIDLKernel SalomeIDLKernel ${OMNIORB_LIBRARIES} - ${PACO_LIBS} + ${PACO_LIBRARIES} ${PYTHON_LIBRARIES} ) @@ -59,7 +58,7 @@ SET(SalomeParallelContainer_SOURCES SALOME_ParallelGlobalProcessVar_i.cxx ) -ADD_DEFINITIONS(${ONMIORB_DEFINITIONS} ${MPI_CXX_COMPILE_FLAGS} ${PACO_DEFINITIONS}) +ADD_DEFINITIONS(${OMNIORB_DEFINITIONS} ${MPI_DEFINITIONS}) ADD_LIBRARY(SalomeParallelContainer ${SalomeParallelContainer_SOURCES}) TARGET_LINK_LIBRARIES(SalomeParallelContainer ${COMMON_LIBS} ${MPI_CXX_LIBRARIES}) @@ -68,9 +67,6 @@ INSTALL(TARGETS SalomeParallelContainer EXPORT ${PROJECT_NAME}TargetGroup DESTIN IF(SALOME_USE_MPI) SET(SALOME_ParallelContainerProxyMpi_LIBS SalomeParallelContainer - ${PaCO_dummy} - ${PaCO_mpi} - ${PaCO_omnithread} ${MPI_CXX_LIBRARIES} ${COMMON_LIBS} ) @@ -87,8 +83,6 @@ ENDIF(SALOME_USE_MPI) SET(SALOME_ParallelContainerProxyDummy_LIBS SalomeParallelContainer - ${PaCO_dummy} - ${PaCO_omnithread} ${COMMON_LIBS} )