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:
authorSybren A. Stüvel <sybren@blender.org>2019-12-14 14:41:07 +0300
committerSybren A. Stüvel <sybren@blender.org>2019-12-14 14:53:37 +0300
commitf8cdc5ac4c0c508deb28a0fc4b432f6e982c4b4f (patch)
tree9fe48fd3535b422ddeed45324439c6145e1bc03c
parent9b871683b1d1bfbcb2e9f2bc57a3065206240191 (diff)
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`.
-rw-r--r--build_files/cmake/platform/platform_apple.cmake6
1 files changed, 4 insertions, 2 deletions
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)