[Bf-blender-cvs] [666485f38ca] master: CMake/macOS: find ZLib before setting CMAKE_PREFIX_PATH

[Ankit Meel]

Commit: 666485f38ca5abe89db042635572bd2a06fb7896
Author: Ankit Meel
Date:   Tue Oct 13 16:34:14 2020 +0530
Branches: master
https://developer.blender.org/rB666485f38ca5abe89db042635572bd2a06fb7896

CMake/macOS: find ZLib before setting CMAKE_PREFIX_PATH

https://devtalk.blender.org/t/building-blender-on-macos-fails/15756/

In some cases, CMake finds the Zlib supplied with OpenCollada
pre-compiled libraries, and not the system one.

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

M	build_files/cmake/platform/platform_apple.cmake

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

diff --git a/build_files/cmake/platform/platform_apple.cmake b/build_files/cmake/platform/platform_apple.cmake
index fa64016392c..020f8defdc0 100644
--- a/build_files/cmake/platform/platform_apple.cmake
+++ b/build_files/cmake/platform/platform_apple.cmake
@@ -44,6 +44,15 @@ function(print_found_status
   endif()
 endfunction()
 
+# ------------------------------------------------------------------------
+# Find system provided libraries.
+
+# Find system ZLIB, not the pre-compiled one supplied with OpenCollada.
+set(ZLIB_ROOT /usr)
+find_package(ZLIB REQUIRED)
+find_package(BZip2 REQUIRED)
+list(APPEND ZLIB_LIBRARIES ${BZIP2_LIBRARIES})
+
 if(NOT DEFINED LIBDIR)
   set(LIBDIR ${CMAKE_SOURCE_DIR}/../lib/darwin)
   # Prefer lib directory paths
@@ -56,16 +65,6 @@ if(NOT EXISTS "${LIBDIR}/")
   message(FATAL_ERROR "Mac OSX requires pre-compiled libs at: '${LIBDIR}'")
 endif()
 
-
-# ------------------------------------------------------------------------
-# Find system provided libraries.
-
-# Find system ZLIB, not the pre-compiled one supplied with OpenCollada.
-set(ZLIB_ROOT /usr)
-find_package(ZLIB REQUIRED)
-find_package(BZip2 REQUIRED)
-list(APPEND ZLIB_LIBRARIES ${BZIP2_LIBRARIES})
-
 # -------------------------------------------------------------------------
 # Find precompiled libraries, and avoid system or user-installed ones.