diff options
author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-06-28 01:13:52 +0300 |
---|---|---|
committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-06-28 01:13:52 +0300 |
commit | 8b2297847f84e88015863b0cc89f8496928ea0e3 (patch) | |
tree | 0ab9ed40c591f490113a5d46076ffcdcfe4f8eb4 /intern | |
parent | 35bfc8c748859d262029e4eb7a154fa1f8f71872 (diff) | |
parent | 9536f67e7eb7befa12c3c6b35068ac15fbbf9032 (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'intern')
-rw-r--r-- | intern/cycles/test/CMakeLists.txt | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/intern/cycles/test/CMakeLists.txt b/intern/cycles/test/CMakeLists.txt index 46c525eb3bb..332e0d8cc78 100644 --- a/intern/cycles/test/CMakeLists.txt +++ b/intern/cycles/test/CMakeLists.txt @@ -91,7 +91,8 @@ link_directories(${OPENIMAGEIO_LIBPATH} ${JPEG_LIBPATH} ${ZLIB_LIBPATH} ${TIFF_LIBPATH} - ${OPENEXR_LIBPATH}) + ${OPENEXR_LIBPATH} + ${OPENCOLORIO_LIBPATH}) set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${PLATFORM_LINKFLAGS}") set(CMAKE_EXE_LINKER_FLAGS_DEBUG "${CMAKE_EXE_LINKER_FLAGS_DEBUG} ${PLATFORM_LINKFLAGS_DEBUG}") |