diff --git a/CMakeLists.txt b/CMakeLists.txt index efd1b23..6b8ba25 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -28,7 +28,7 @@ set( OCIO_PATH ${GAFFER_ROOT} CACHE INTERNAL "" ) set( GLEW_ROOT_DIR ${GAFFER_ROOT} CACHE INTERNAL "" ) set( WITH_OPENVDB ON CACHE INTERNAL "" ) set( OPENVDB_ROOT_DIR ${GAFFER_ROOT} CACHE INTERNAL "" ) -set( TBB_INSTALL_DIR ${GAFFER_ROOT} CACHE INTERNAL "" ) +set( TBB_ROOT_DIR ${GAFFER_ROOT} CACHE INTERNAL "" ) if (MSVC) set( ZLIB_ROOT ${GAFFER_ROOT} CACHE INTERNAL "" ) set( ZLIB_INCLUDE_DIRS ${GAFFER_ROOT}/include CACHE INTERNAL "" ) diff --git a/cycles b/cycles index 11e3ab5..53f25d7 160000 --- a/cycles +++ b/cycles @@ -1 +1 @@ -Subproject commit 11e3ab51d577eabf5597926d42fa228e1cb988f0 +Subproject commit 53f25d70df48f62157fd750b503068790f1ff7f3