[Bf-blender-cvs] [3607b4eb521] master: Fix LLVM/OSL library detection on macOS to prefer own OSL libraries.

[Brecht Van Lommel]

Commit: 3607b4eb521d94f67a776444906e1f78c3f60b40
Author: Brecht Van Lommel
Date:   Sun Mar 4 07:30:04 2018 +0100
Branches: master
https://developer.blender.org/rB3607b4eb521d94f67a776444906e1f78c3f60b40

Fix LLVM/OSL library detection on macOS to prefer own OSL libraries.

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

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 1435572fa5e..caaf7b96d0e 100644
--- a/build_files/cmake/platform/platform_apple.cmake
+++ b/build_files/cmake/platform/platform_apple.cmake
@@ -29,6 +29,9 @@ endmacro()
 
 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()
@@ -325,8 +328,8 @@ if(WITH_OPENVDB)
 endif()
 
 if(WITH_LLVM)
-	set(LLVM_ROOT_DIR ${LIBDIR}/llvm CACHE PATH	"Path to the LLVM installation")
-	set(LLVM_VERSION "3.4" CACHE STRING	"Version of LLVM to use")
+	set(LLVM_ROOT_DIR ${LIBDIR}/llvm)
+	set(LLVM_VERSION 3.4)
 	if(EXISTS "${LLVM_ROOT_DIR}/bin/llvm-config")
 		set(LLVM_CONFIG "${LLVM_ROOT_DIR}/bin/llvm-config")
 	else()
@@ -363,7 +366,7 @@ if(WITH_LLVM)
 endif()
 
 if(WITH_CYCLES_OSL)
-	set(CYCLES_OSL ${LIBDIR}/osl CACHE PATH "Path to OpenShadingLanguage installation")
+	set(CYCLES_OSL ${LIBDIR}/osl)
 
 	find_library(OSL_LIB_EXEC NAMES oslexec PATHS ${CYCLES_OSL}/lib)
 	find_library(OSL_LIB_COMP NAMES oslcomp PATHS ${CYCLES_OSL}/lib)