Merge branch 'master' of newgeom:newgeom.git into BR_PORTING_CENTOS_6_3

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

diff --git a/CMakeCommon/XMLProcessing.cmake b/CMakeCommon/XMLProcessing.cmake
index 5e38c02ec11bba25b3e3a0716796954a36059a00..a1dbefe0ad1534fa369d63680cd0396742b4cecb 100644 (file)
--- a/CMakeCommon/XMLProcessing.cmake
+++ b/CMakeCommon/XMLProcessing.cmake
@@ -1,4 +1,3 @@
-SET(LIBXMLDIR $ENV{LIBXML2_ROOT_DIR})
 
 IF(WIN32)
   INCLUDE_DIRECTORIES(${LIBXMLDIR}/include)
@@ -7,27 +6,22 @@ ELSE()
 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})
 ENDIF()
+LINK_DIRECTORIES (${LIBXMLDIR}/lib)
 
-
-#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})