X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FContainer%2FCMakeLists.txt;h=530763b1ea0b90ee8e62c865f5d26c951518f261;hb=52111d0ad7a0d8acccc1bb4e49bb5877d949b844;hp=b11ecbbc4c21d4a6a8efd0f3ea085d81f7626730;hpb=2e1b544d56e4c289b3969f061628990912af1438;p=modules%2Fkernel.git diff --git a/src/Container/CMakeLists.txt b/src/Container/CMakeLists.txt index b11ecbbc4..530763b1e 100755 --- a/src/Container/CMakeLists.txt +++ b/src/Container/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 @@ -21,7 +21,6 @@ INCLUDE_DIRECTORIES( ${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 @@ -43,7 +42,7 @@ SET(SCRIPTS SALOME_Container.py ) -ADD_DEFINITIONS(${HDF5_DEFINITIONS} ${LIBXML2_DEFINITIONS} ${OMNIORB_DEFINITIONS}) +ADD_DEFINITIONS(${HDF5_DEFINITIONS} ${OMNIORB_DEFINITIONS}) SET(COMMON_LIBS Registry SalomeNotification @@ -61,7 +60,7 @@ SET(COMMON_LIBS ) IF(WITH_MPI_SEQ_CONTAINER) - ADD_DEFINITIONS(${MPI_CXX_COMPILE_FLAGS}) + ADD_DEFINITIONS(${MPI_DEFINITIONS}) SET(COMMON_LIBS ${MPI_CXX_LIBRARIES} )