Merge branch 'v2.7.6' of github.com:OpenCMISS-Dependencies/libxml2 in…

…to v2.7.6
OpenCMISS-Dependencies · Jun 8, 2015 · 1666703 · 1666703
2 parents 01a216d + b20d2c5
commit 1666703
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 0 deletions.
diff --git a/.project b/.project
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>LibXML2</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+	</buildSpec>
+	<natures>
+	</natures>
+</projectDescription>
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -518,6 +518,9 @@ ENDIF( ${CMAKE_SYSTEM_NAME} STREQUAL "Linux" AND ${CMAKE_SYSTEM_PROCESSOR} STREQ
 ADD_LIBRARY( ${LIBRARY_TARGET_NAME} ${LIBRARY_BUILD_TYPE} ${XML2_SRCS} ${PUBLIC_HDRS} ${PRIVATE_HDRS} )
 # Add the necessary flag to tell that XPATH is enabled
 target_compile_definitions(${LIBRARY_TARGET_NAME} PUBLIC LIBXML_XPATH_ENABLED)
+if (WIN32)
+    target_compile_definitions(${LIBRARY_TARGET_NAME} PUBLIC _WINDOWS)
+endif()
 
 IF( ZLIB_FOUND )
 	TARGET_LINK_LIBRARIES( ${LIBRARY_TARGET_NAME} zlib)