Merge branch 'master' into blender2.8
[blender.git] / intern / cycles / app / CMakeLists.txt
index 34ff2988410ab2d5d85870c14f25860ca7a83971..6e47ebe2a9e8cd36151ebe528ffd3757f431288f 100644 (file)
@@ -60,6 +60,10 @@ link_directories(${OPENIMAGEIO_LIBPATH}
                  ${TIFF_LIBPATH}
                  ${OPENEXR_LIBPATH})
 
                  ${TIFF_LIBPATH}
                  ${OPENEXR_LIBPATH})
 
+if(WITH_OPENCOLORIO)
+       link_directories(${OPENCOLORIO_LIBPATH})
+endif()
+
 add_definitions(${GL_DEFINITIONS})
 
 include_directories(${INC})
 add_definitions(${GL_DEFINITIONS})
 
 include_directories(${INC})
@@ -81,7 +85,6 @@ macro(cycles_target_link_libraries target)
                target_link_libraries(${target} ${OPENSUBDIV_LIBRARIES})
        endif()
        if(WITH_OPENCOLORIO)
                target_link_libraries(${target} ${OPENSUBDIV_LIBRARIES})
        endif()
        if(WITH_OPENCOLORIO)
-               link_directories(${OPENCOLORIO_LIBPATH})
                target_link_libraries(${target} ${OPENCOLORIO_LIBRARIES})
        endif()
        target_link_libraries(
                target_link_libraries(${target} ${OPENCOLORIO_LIBRARIES})
        endif()
        target_link_libraries(