Corrections in Windows MSVC10 environment according to the Linux environment

[modules/shaper.git] / CMakeCommon / XMLProcessing.cmake

diff --git a/CMakeCommon/XMLProcessing.cmake b/CMakeCommon/XMLProcessing.cmake
index 3595cbb3335a14b8312caf34a06d4e51ca3a1bb9..9abfef07afcd890ddb6ac7b86018aff433fcc6b2 100644 (file)
--- a/CMakeCommon/XMLProcessing.cmake
+++ b/CMakeCommon/XMLProcessing.cmake
@@ -1,28 +1,14 @@
-SET(LIBXMLDIR $ENV{LIBXML_DIR})
 
 IF(WIN32)
-  INCLUDE_DIRECTORIES(${LIBXMLDIR}/include)
+    FILE(TO_CMAKE_PATH $ENV{LIBXML_DIR}/lib/libxml2.lib LIBXML2_LIBRARIES)
+       FILE(TO_CMAKE_PATH $ENV{LIBXML_DIR}/include LIBXML2_INCLUDE_DIR)
 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)
-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{LIBXML_DIR}/lib/libxml2.so LIBXML2_LIBRARIES)
+       FILE(TO_CMAKE_PATH $ENV{LIBXML_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})