diff options
| author | Stefan Werner <stefan.werner@intel.com> | 2022-05-02 10:31:31 +0300 |
|---|---|---|
| committer | Stefan Werner <stefan.werner@intel.com> | 2022-05-02 10:31:31 +0300 |
| commit | 7cb48199fd17f5b8c69289c8b078a85995780803 (patch) | |
| tree | 1f9bae29c4c76e26eb6444a0c6a26698ebed3737 /CMakeLists.txt | |
| parent | 343a5812d60ddbe05d3abdef509fdcf9de4fc970 (diff) | |
| parent | a5644f9a28ea46892f9a480a5bb7b44a8f0c8759 (diff) | |
Merge branch 'master' into cycles_oneapi
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 59af96e9ca5..5fe95f4b4b1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -824,6 +824,9 @@ set_and_warn_dependency(WITH_IMAGE_OPENEXR WITH_OPENCOLORIO OFF) # Haru needs `TIFFFaxBlackCodes` & `TIFFFaxWhiteCodes` symbols from TIFF. set_and_warn_dependency(WITH_IMAGE_TIFF WITH_HARU OFF) +# USD needs OpenSubDiv, since that is used by the Cycles Hydra render delegate. +set_and_warn_dependency(WITH_OPENSUBDIV WITH_USD OFF) + # auto enable openimageio for cycles if(WITH_CYCLES) set(WITH_OPENIMAGEIO ON) |