From: vsr Date: Wed, 9 Oct 2013 06:55:05 +0000 (+0000) Subject: Minimize external dependencies: libxml is "local" dependency for KERNEL X-Git-Tag: BR_hydro_v_0_3_1~94 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=f3cc02d8f30517806d3735a9d07b8d98c95169e5;p=modules%2Fkernel.git Minimize external dependencies: libxml is "local" dependency for KERNEL --- diff --git a/src/Container/CMakeLists.txt b/src/Container/CMakeLists.txt index b11ecbbc4..b63ac7f24 100755 --- a/src/Container/CMakeLists.txt +++ b/src/Container/CMakeLists.txt @@ -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 diff --git a/src/LifeCycleCORBA/CMakeLists.txt b/src/LifeCycleCORBA/CMakeLists.txt index 17a3fb21b..a549a4320 100755 --- a/src/LifeCycleCORBA/CMakeLists.txt +++ b/src/LifeCycleCORBA/CMakeLists.txt @@ -18,7 +18,6 @@ # INCLUDE_DIRECTORIES( - ${LIBXML2_INCLUDE_DIR} ${OMNIORB_INCLUDE_DIR} ${PTHREAD_INCLUDE_DIR} ${PYTHON_INCLUDE_DIRS} @@ -48,7 +47,7 @@ SET(COMMON_LIBS SalomeIDLKernel ) -ADD_DEFINITIONS(${LIBXML2_DEFINITIONS} ${OMNIORB_DEFINITIONS}) +ADD_DEFINITIONS(${OMNIORB_DEFINITIONS}) ADD_LIBRARY(SalomeLifeCycleCORBA SALOME_LifeCycleCORBA.cxx SALOME_FileTransferCORBA.cxx) TARGET_LINK_LIBRARIES(SalomeLifeCycleCORBA ${COMMON_LIBS})