X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=CMakeCommon%2FXMLProcessing.cmake;h=16a3f11bac9fcd54ddb5ef95a2a38c37a3220f39;hb=90031a393623d09c62d33690830010f1cc3ab6e3;hp=836757794e76bccd34956a6071a5143b6bcaee95;hpb=a793636ae5265326796c7b5a26a5000041567d43;p=modules%2Fshaper.git

diff --git a/CMakeCommon/XMLProcessing.cmake b/CMakeCommon/XMLProcessing.cmake
index 836757794..16a3f11ba 100644
--- a/CMakeCommon/XMLProcessing.cmake
+++ b/CMakeCommon/XMLProcessing.cmake
@@ -1,29 +1,16 @@
-SET(LIBXMLDIR $ENV{LIBXML2_DIR})
+## Copyright (C) 2014-20xx CEA/DEN, EDF R&D
+
 
 IF(WIN32)
-  INCLUDE_DIRECTORIES(${LIBXMLDIR}/include)
+    FILE(TO_CMAKE_PATH $ENV{LIBXML2_ROOT_DIR}/lib/libxml2.lib LIBXML2_LIBRARIES)
+	FILE(TO_CMAKE_PATH $ENV{LIBXML2_ROOT_DIR}/include LIBXML2_INCLUDE_DIR)
 ELSE()
-  INCLUDE_DIRECTORIES(${LIBXMLDIR}/include/libxml2)
-ENDIF(WIN32)
-
-LINK_DIRECTORIES (${LIBXMLDIR}/lib)
-
-SET(LIBXML2_LIBRARIES ${LIBXMLDIR}/lib/libxml2.lib)
-#set(PROJECT_LIBRARIES ${PROJECT_LIBRARIES} ${LIBXMLDIR}/lib/libxml2.lib)
-
-#FILE(TO_CMAKE_PATH $ENV{PC_LIBXML_INCLUDEDIR} PC_LIBXML_INCLUDEDIR)
-#FILE(TO_CMAKE_PATH $ENV{PC_LIBXML_INCLUDEDIR} PC_LIBXML_INCLUDEDIR)
-#FILE(TO_CMAKE_PATH $ENV{PC_LIBXML_LIBDIR} PC_LIBXML_LIBDIR)
-#message(STATUS "PC_LIBXML_INCLUDEDIR " ${PC_LIBXML_INCLUDEDIR})
-#message(STATUS "PC_LIBXML_LIBDIR " ${PC_LIBXML_LIBDIR})
+    FILE(TO_CMAKE_PATH $ENV{LIBXML2_ROOT_DIR}/lib/libxml2.so LIBXML2_LIBRARIES)
+	FILE(TO_CMAKE_PATH $ENV{LIBXML2_ROOT_DIR}/include/libxml2 LIBXML2_INCLUDE_DIR)
+ENDIF()
 
- 
-#FIND_PACKAGE(LibXml2 REQUIRED)
-#if(LIBXML2_FOUND)
-#    message(STATUS "Found libxml2 ver. " ${LIBXML2_VERSION_STRING})
-#    message(STATUS "LIBXML2_LIBRARIES " ${LIBXML2_LIBRARIES})
-#    message(STATUS "LIBXML2_INCLUDE_DIR " ${LIBXML2_INCLUDE_DIR})
-#endif(LIBXML2_FOUND)
+FIND_PACKAGE(LibXml2 REQUIRED)
 
-#INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR})
-#ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
+ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
+INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR})
+LINK_DIRECTORIES (${LIBXML2_LIBRARIES})