Merge branch 'devel' of github.com:OpenCMISS-Dependencies/libxml2 int…

…o devel Conflicts: CMakeLists.txt
OpenCMISS-Dependencies · Sep 5, 2015 · 609dd39 · 609dd39
2 parents 188a008 + c1958bf
commit 609dd39
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -328,6 +328,10 @@ target_include_directories(xml2 PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/include incl
 target_compile_definitions(xml2 PUBLIC LIBXML_XPATH_ENABLED)
 if (WIN32)
     target_compile_definitions(xml2 PUBLIC _WINDOWS)
+    # Fix for nanoftp/nanohttp
+    if (MINGW)
+        target_link_libraries(${LIBRARY_TARGET_NAME} PUBLIC ws2_32)
+    endif()
 endif()
 if(MSVC)
 	target_compile_definitions(xml2 PRIVATE _CRT_SECURE_NO_WARNINGS WINVER=0x0600)