Merge branch 'master' of newgeom:newgeom

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

diff --git a/CMakeCommon/XMLProcessing.cmake b/CMakeCommon/XMLProcessing.cmake
index 114371138f060b19515195ecc7dffd646614f995..04860f1b268922735592c971499a04d39de8ea5c 100644 (file)
--- a/CMakeCommon/XMLProcessing.cmake
+++ b/CMakeCommon/XMLProcessing.cmake
@@ -1,13 +1,14 @@
-CMAKE_MINIMUM_REQUIRED(VERSION 2.8.11)
 
-FILE(TO_CMAKE_PATH $ENV{LIBXML2_INCLUDE_DIR} LIBXML2_INCLUDE_DIR)
- 
+IF(WIN32)
+    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()
+    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()
+
 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})
+INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR})
+LINK_DIRECTORIES (${LIBXML2_LIBRARIES})