-# 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
${OMNIORB_INCLUDE_DIR}
${PTHREAD_INCLUDE_DIR}
${HDF5_INCLUDE_DIRS}
- ${LIBXML2_INCLUDE_DIR}
${PYTHON_INCLUDE_DIRS}
${PROJECT_BINARY_DIR}/salome_adm
${CMAKE_CURRENT_SOURCE_DIR}/../Basics
SALOME_Container.py
)
-ADD_DEFINITIONS(${HDF5_DEFINITIONS} ${LIBXML2_DEFINITIONS} ${OMNIORB_DEFINITIONS})
+ADD_DEFINITIONS(${HDF5_DEFINITIONS} ${OMNIORB_DEFINITIONS})
SET(COMMON_LIBS
Registry
SalomeNotification
)
IF(WITH_MPI_SEQ_CONTAINER)
- ADD_DEFINITIONS(${MPI_CXX_COMPILE_FLAGS})
+ ADD_DEFINITIONS(${MPI_DEFINITIONS})
SET(COMMON_LIBS
${MPI_CXX_LIBRARIES}
)
ENDIF(WITH_MPI_SEQ_CONTAINER)
IF(SALOME_PACO_PARALLEL)
- ADD_DEFINITIONS(-DWITH_PACO_PARALLEL ${PACO_DEFINITIONS})
- SET(COMMON_LIBS
- ${COMMON_LIBS}
- ${PACO_LIBS}
- )
+ INCLUDE_DIRECTORIES(${PACO_INCLUDE_DIRS})
+ ADD_DEFINITIONS(-DWITH_PACO_PARALLEL)
+ LIST(APPEND COMMON_LIBS ${PACO_LIBRARIES})
ENDIF()
SET(SalomeContainer_SOURCES