[Bf-blender-cvs] [f8cdc5ac4c0] master: USD: on Apple disable USD if library cannot be found

[Sybren A. Stüvel]

Commit: f8cdc5ac4c0c508deb28a0fc4b432f6e982c4b4f
Author: Sybren A. Stüvel
Date:   Sat Dec 14 12:41:07 2019 +0100
Branches: master
https://developer.blender.org/rBf8cdc5ac4c0c508deb28a0fc4b432f6e982c4b4f

USD: on Apple disable USD if library cannot be found

When building with `WITH_USD=ON` on Apple but the USD library cannot be
found, the CMake script now just sets `WITH_USD=OFF`.

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

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 d99d7ec3c0c..a5f79c58ab1 100644
--- a/build_files/cmake/platform/platform_apple.cmake
+++ b/build_files/cmake/platform/platform_apple.cmake
@@ -57,8 +57,10 @@ if(WITH_ALEMBIC)
 endif()
 
 if(WITH_USD)
-  set(USD_LIBRARIES ${LIBDIR}/usd/lib/libusd_m.a)
-  SET(USD_INCLUDE_DIRS ${LIBDIR}/usd/include)
+  find_package(USD)
+  if(NOT USD_FOUND)
+    set(WITH_USD OFF)
+  endif()
 endif()
 
 if(WITH_OPENSUBDIV)