Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRebecca Dengate <beckyd>2020-11-29 10:51:54 +0300
committerAnkit Meel <ankitjmeel@gmail.com>2020-11-29 11:04:33 +0300
commit13c820d87b62ea55c262bfb2805bd19ae65ddc07 (patch)
tree0c5ef4f94db0c7d8dfb4a264d8b51bd26aa2e4d8 /build_files/cmake/platform/platform_apple.cmake
parent458d8a423a2fde63e367c605ad069cc76d34ea2c (diff)
CMake/macOS: Use custom LIBDIR if set on CLI
Reviewed By: ankitm Maniphest Tasks: T83174 Differential Revision: https://developer.blender.org/D9664
Diffstat (limited to 'build_files/cmake/platform/platform_apple.cmake')
-rw-r--r--build_files/cmake/platform/platform_apple.cmake7
1 files changed, 4 insertions, 3 deletions
diff --git a/build_files/cmake/platform/platform_apple.cmake b/build_files/cmake/platform/platform_apple.cmake
index d9772093235..586c72c9c7e 100644
--- a/build_files/cmake/platform/platform_apple.cmake
+++ b/build_files/cmake/platform/platform_apple.cmake
@@ -73,9 +73,6 @@ endif()
if(NOT DEFINED LIBDIR)
set(LIBDIR ${CMAKE_SOURCE_DIR}/../lib/darwin)
- # Prefer lib directory paths
- file(GLOB LIB_SUBDIRS ${LIBDIR}/*)
- set(CMAKE_PREFIX_PATH ${LIB_SUBDIRS})
else()
message(STATUS "Using pre-compiled LIBDIR: ${LIBDIR}")
endif()
@@ -83,6 +80,10 @@ if(NOT EXISTS "${LIBDIR}/")
message(FATAL_ERROR "Mac OSX requires pre-compiled libs at: '${LIBDIR}'")
endif()
+# Prefer lib directory paths
+file(GLOB LIB_SUBDIRS ${LIBDIR}/*)
+set(CMAKE_PREFIX_PATH ${LIB_SUBDIRS})
+
# -------------------------------------------------------------------------
# Find precompiled libraries, and avoid system or user-installed ones.