X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=CMakeCommon%2FXMLProcessing.cmake;h=16a3f11bac9fcd54ddb5ef95a2a38c37a3220f39;hb=328e2d6c940686a67a0cc7fddfc674b317e7d695;hp=5e38c02ec11bba25b3e3a0716796954a36059a00;hpb=62aff3aeed20f6d8e4001a2473bee227f92d9f66;p=modules%2Fshaper.git

diff --git a/CMakeCommon/XMLProcessing.cmake b/CMakeCommon/XMLProcessing.cmake
index 5e38c02ec..16a3f11ba 100644
--- a/CMakeCommon/XMLProcessing.cmake
+++ b/CMakeCommon/XMLProcessing.cmake
@@ -1,33 +1,16 @@
-SET(LIBXMLDIR $ENV{LIBXML2_ROOT_DIR})
+## Copyright (C) 2014-20xx CEA/DEN, EDF R&D
 
-IF(WIN32)
-  INCLUDE_DIRECTORIES(${LIBXMLDIR}/include)
-ELSE()
-  INCLUDE_DIRECTORIES(${LIBXMLDIR}/include/libxml2)
-ENDIF(WIN32)
 
-LINK_DIRECTORIES (${LIBXMLDIR}/lib)
 IF(WIN32)
-    SET(LIBXML2_LIBRARIES ${LIBXMLDIR}/lib/libxml2.lib)
+    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()
-    SET(LIBXML2_LIBRARIES ${LIBXMLDIR}/lib/libxml2.so)
+    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)
 
-#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})
- 
-#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)
-
-#INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR})
-#ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
+ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
+INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR})
+LINK_DIRECTORIES (${LIBXML2_LIBRARIES})