From 2c4a8e5b8427684c74f34bf327e38fe309d4519e Mon Sep 17 00:00:00 2001 From: ageay Date: Fri, 30 Mar 2012 09:59:54 +0000 Subject: [PATCH] MED CMakization. --- salome_adm/cmake_files/FindLIBXML2.cmake | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/salome_adm/cmake_files/FindLIBXML2.cmake b/salome_adm/cmake_files/FindLIBXML2.cmake index 44610e9a8..67c539082 100644 --- a/salome_adm/cmake_files/FindLIBXML2.cmake +++ b/salome_adm/cmake_files/FindLIBXML2.cmake @@ -85,7 +85,8 @@ IF(LIBXML2_STATUS) SET(LIBXML2_INCLUDE_TO_FIND libxml/parser.h) FIND_PATH(LIBXML2_INCLUDE_DIR ${LIBXML2_INCLUDE_TO_FIND} PATHS ${LIBXML2_INCLUDE_PATHS} ${LIBXML2_FIND_PATHS_OPTION}) IF(LIBXML2_INCLUDE_DIR) - SET(LIBXML2_INCLUDES -I${LIBXML2_INCLUDE_DIR}) + SET(LIBXML2_INCLUDES -I${LIBXML2_INCLUDE_DIR})# to remove + SET(LIBXML_INCLUDES_DIR ${LIBXML2_INCLUDE_DIR}) MESSAGE(STATUS "${LIBXML2_INCLUDE_TO_FIND} found in ${LIBXML2_INCLUDE_DIR}") ELSE(LIBXML2_INCLUDE_DIR) SET(LIBXML2_STATUS 0) @@ -134,15 +135,17 @@ IF(WINDOWS) IF(ICONV_ROOT) FIND_PATH(ICONV_INCLUDE_DIR iconv.h ${ICONV_ROOT}/include) FIND_LIBRARY(ICONV_LIBS iconv ${ICONV_ROOT}/lib) - SET(LIBXML2_INCLUDES ${LIBXML2_INCLUDES} -I${ICONV_INCLUDE_DIR}) + SET(LIBXML2_INCLUDES ${LIBXML2_INCLUDES} -I${ICONV_INCLUDE_DIR})# to remove + SET(LIBXML_INCLUDES_DIR ${LIBXML2_INCLUDES_DIR} ${ICONV_INCLUDE_DIR}) SET(LIBXML2_LIBS ${LIBXML2_LIBS} ${ICONV_LIBS}) ENDIF(ICONV_ROOT) ENDIF(WINDOWS) # ------ IF(LIBXML2_STATUS) - SET(LIBXML_INCLUDES ${LIBXML2_INCLUDES}) + SET(LIBXML_INCLUDES ${LIBXML2_INCLUDES})# to remove SET(LIBXML_CPPFLAGS ${LIBXML2_INCLUDES}) + SET(LIBXML_FLAGS) SET(LIBXML_LIBS ${LIBXML2_LIBS}) ELSE(LIBXML2_STATUS) IF(LIBXML2_IS_MANDATORY) -- 2.39.2