[Bf-blender-cvs] [fcffb14] master: Fix linking issue with OpenEXR and Zlib.

[Kévin Dietrich]

Commit: fcffb14d7b9db44647b324a80213206d0e0decb1
Author: Kévin Dietrich
Date:   Fri Aug 26 14:28:39 2016 +0200
Branches: master
https://developer.blender.org/rBfcffb14d7b9db44647b324a80213206d0e0decb1

Fix linking issue with OpenEXR and Zlib.

Link Zlib after OpenEXR.

Differential Revision: https://developer.blender.org/D2176

===================================================================

M	build_files/cmake/macros.cmake

===================================================================

diff --git a/build_files/cmake/macros.cmake b/build_files/cmake/macros.cmake
index c4e1c56..dc8b158 100644
--- a/build_files/cmake/macros.cmake
+++ b/build_files/cmake/macros.cmake
@@ -359,7 +359,6 @@ function(setup_liblinks
 	target_link_libraries(
 		${target}
 		${PNG_LIBRARIES}
-		${ZLIB_LIBRARIES}
 		${FREETYPE_LIBRARY}
 	)
 
@@ -510,6 +509,11 @@ function(setup_liblinks
 		endif()
 	endif()
 
+	target_link_libraries(
+		${target}
+		${ZLIB_LIBRARIES}
+	)
+
 	#system libraries with no dependencies such as platform link libs or opengl should go last
 	target_link_libraries(${target}
 			${BLENDER_GL_LIBRARIES})