[Bf-blender-cvs] [987b3abeb45] master: CMake: Make sure zlib folder comes first for precompiled Linux libraries

[Sergey Sharybin]

Commit: 987b3abeb456fea55d14c8646b6dc253c7eb356c
Author: Sergey Sharybin
Date:   Wed Aug 29 15:05:03 2018 +0200
Branches: master
https://developer.blender.org/rB987b3abeb456fea55d14c8646b6dc253c7eb356c

CMake: Make sure zlib folder comes first for precompiled Linux libraries

Without this find_package(ZLIB) will find ZLib from OpenCollada folder,
which has older ABI and is not what was used to link PNG against.

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

M	build_files/cmake/platform/platform_unix.cmake

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

diff --git a/build_files/cmake/platform/platform_unix.cmake b/build_files/cmake/platform/platform_unix.cmake
index 74958a8731c..43a06c67373 100644
--- a/build_files/cmake/platform/platform_unix.cmake
+++ b/build_files/cmake/platform/platform_unix.cmake
@@ -30,7 +30,10 @@ set(LIBDIR ${CMAKE_SOURCE_DIR}/../lib/${LIBDIR_NAME})
 
 if(EXISTS ${LIBDIR})
 	file(GLOB LIB_SUBDIRS ${LIBDIR}/*)
-	set(CMAKE_PREFIX_PATH ${LIB_SUBDIRS})
+	# NOTE: Make sure "proper" compiled zlib comes first before the one
+	# which is a part of OpenCollada. They have different ABI, and we
+	# do need to use the official one.
+	set(CMAKE_PREFIX_PATH ${LIBDIR}/zlib ${LIB_SUBDIRS})
 	set(WITH_STATIC_LIBS ON)
 	set(WITH_OPENMP_STATIC ON)
 endif()