Merge branch 'master' into blender2.8

This commit is contained in:
Brecht Van Lommel 2018-09-27 20:12:14 +02:00
commit 975a40dceb

@ -147,6 +147,9 @@ if(WITH_CYCLES_CUBIN_COMPILER)
target_link_libraries(cycles_cubin_cc
extern_cuew
${OPENIMAGEIO_LIBRARIES}
${OPENEXR_LIBRARIES}
${PUGIXML_LIBRARIES}
${BOOST_LIBRARIES}
${PLATFORM_LINKLIBS}
)
if(NOT CYCLES_STANDALONE_REPOSITORY)