From 987b3abeb456fea55d14c8646b6dc253c7eb356c Mon Sep 17 00:00:00 2001 From: Sergey Sharybin Date: Wed, 29 Aug 2018 15:05:03 +0200 Subject: [PATCH] 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. --- build_files/cmake/platform/platform_unix.cmake | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) 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()