Merge release-5-0 into release-5-1

Change-Id: If110ea29e1756bf6c0b18d3d3852ee4099641ea1

diff --git a/cmake/gmxTestLibXml2.cmake b/cmake/gmxTestLibXml2.cmake
index 38470501efd9fe575c5b31e73233873556194599..e79b03fcd198fd8bbcd80847d915379c62885907 100644 (file)
--- a/cmake/gmxTestLibXml2.cmake
+++ b/cmake/gmxTestLibXml2.cmake
@@ -51,7 +51,7 @@ function(GMX_TEST_LIBXML2 VARIABLE)
     endif()
 
     if(HAVE_ZLIB)
-        set(LIBXML2_LIBRARIES "${LIBXML2_LIBRARIES}" z PARENT_SCOPE) #not needed for dynamic but does not hurt
+        set(LIBXML2_LIBRARIES "${LIBXML2_LIBRARIES};${ZLIB_LIBRARIES}" PARENT_SCOPE) #not needed for dynamic but does not hurt
     endif()
 
     string(TOUPPER "${CMAKE_BUILD_TYPE}" _cmake_build_type)