Merge branch 'origin/BR_PORTING_CENTOS_6_3'

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

diff --git a/CMakeCommon/XMLProcessing.cmake b/CMakeCommon/XMLProcessing.cmake
index 836757794e76bccd34956a6071a5143b6bcaee95..5e38c02ec11bba25b3e3a0716796954a36059a00 100644 (file)
--- a/CMakeCommon/XMLProcessing.cmake
+++ b/CMakeCommon/XMLProcessing.cmake
@@ -1,4 +1,4 @@
-SET(LIBXMLDIR $ENV{LIBXML2_DIR})
+SET(LIBXMLDIR $ENV{LIBXML2_ROOT_DIR})
 
 IF(WIN32)
   INCLUDE_DIRECTORIES(${LIBXMLDIR}/include)
@@ -7,8 +7,13 @@ ELSE()
 ENDIF(WIN32)
 
 LINK_DIRECTORIES (${LIBXMLDIR}/lib)
+IF(WIN32)
+    SET(LIBXML2_LIBRARIES ${LIBXMLDIR}/lib/libxml2.lib)
+ELSE()
+    SET(LIBXML2_LIBRARIES ${LIBXMLDIR}/lib/libxml2.so)
+ENDIF()
+
 
-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)
@@ -16,7 +21,6 @@ SET(LIBXML2_LIBRARIES ${LIBXMLDIR}/lib/libxml2.lib)
 #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)