[Bf-blender-cvs] [6ea1176d1f5] sybren-usd: USD: Make USD_PATH configurable via a CMake variable

[Sybren A. Stüvel]

Commit: 6ea1176d1f5a36f5a6d87a5a6d1b1450dfdbd359
Author: Sybren A. Stüvel
Date:   Tue Jul 16 10:49:13 2019 +0200
Branches: sybren-usd
https://developer.blender.org/rB6ea1176d1f5a36f5a6d87a5a6d1b1450dfdbd359

USD: Make USD_PATH configurable via a CMake variable

The default is still `USD_PATH=/opt/usd`, and using USD still requires you
to manually install USD without Python bindings.

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

M	CMakeLists.txt
M	source/blender/usd/CMakeLists.txt

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

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 31ba7874fdb..464ddf1cc02 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -325,6 +325,7 @@ option(WITH_ALEMBIC_HDF5        "Enable Legacy Alembic Support (not officially s
 
 # Universal Scene Description support
 option(WITH_USD                 "Enable Universal Scene Description (USD) Support" OFF)
+set(USD_PATH "/opt/usd" CACHE STRING "Universal Scene Description (USD) installation path")
 
 # 3D format support
 # Disable opencollada when we don't have precompiled libs
diff --git a/source/blender/usd/CMakeLists.txt b/source/blender/usd/CMakeLists.txt
index 3c76c95e31c..95046a48a74 100644
--- a/source/blender/usd/CMakeLists.txt
+++ b/source/blender/usd/CMakeLists.txt
@@ -18,7 +18,7 @@
 # All rights reserved.
 # ***** END GPL LICENSE BLOCK *****
 
-include(/opt/usd/pxrConfig.cmake)
+include(${USD_PATH}/pxrConfig.cmake)
 
 # This suppresses the warning "This file includes at least one deprecated or antiquated header which
 # may be removed without further notice at a future date", which is caused by the USD library