[Bf-blender-cvs] [58cf6a33482] temp-sybren-usd-apple: USD: build without USD if library cannot be found
Sybren A. Stüvel
noreply at git.blender.org
Sat Dec 14 12:41:16 CET 2019
Commit: 58cf6a33482f8c5d686977c4c6ebc9e68debdaa7
Author: Sybren A. Stüvel
Date: Sat Dec 14 12:41:07 2019 +0100
Branches: temp-sybren-usd-apple
https://developer.blender.org/rB58cf6a33482f8c5d686977c4c6ebc9e68debdaa7
USD: build without USD if library cannot be found
===================================================================
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..2dba67fb840 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)
More information about the Bf-blender-cvs
mailing list