X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=CMakeCommon%2FXMLProcessing.cmake;h=16a3f11bac9fcd54ddb5ef95a2a38c37a3220f39;hb=c285a7ee449e8cf5de6f94a2170b9587587afe65;hp=a1dbefe0ad1534fa369d63680cd0396742b4cecb;hpb=a1d3e85f42aebdcf8b570ab99f5f4558612573e7;p=modules%2Fshaper.git

diff --git a/CMakeCommon/XMLProcessing.cmake b/CMakeCommon/XMLProcessing.cmake
index a1dbefe0a..16a3f11ba 100644
--- a/CMakeCommon/XMLProcessing.cmake
+++ b/CMakeCommon/XMLProcessing.cmake
@@ -1,27 +1,16 @@
+## 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)
-    INCLUDE_DIRECTORIES(${LIBXMLDIR}/include/libxml2)
+    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)
-    SET(LIBXML2_INCLUDE_DIR ${LIBXMLDIR}/include/libxml2)
-	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})
+    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()
-LINK_DIRECTORIES (${LIBXMLDIR}/lib)
 
+FIND_PACKAGE(LibXml2 REQUIRED)
+
+ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
+INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR})
+LINK_DIRECTORIES (${LIBXML2_LIBRARIES})