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 114371138f060b19515195ecc7dffd646614f995..5e38c02ec11bba25b3e3a0716796954a36059a00 100644 (file)
--- a/CMakeCommon/XMLProcessing.cmake
+++ b/CMakeCommon/XMLProcessing.cmake
@@ -1,13 +1,33 @@
-CMAKE_MINIMUM_REQUIRED(VERSION 2.8.11)
+SET(LIBXMLDIR $ENV{LIBXML2_ROOT_DIR})
 
-FILE(TO_CMAKE_PATH $ENV{LIBXML2_INCLUDE_DIR} LIBXML2_INCLUDE_DIR)
+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)
+ELSE()
+    SET(LIBXML2_LIBRARIES ${LIBXMLDIR}/lib/libxml2.so)
+ENDIF()
+
+
+#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})
+#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})