Merge branch 'master' into blender2.8
authorBrecht Van Lommel <brechtvanlommel@gmail.com>
Thu, 27 Sep 2018 18:12:14 +0000 (20:12 +0200)
committerBrecht Van Lommel <brechtvanlommel@gmail.com>
Thu, 27 Sep 2018 18:12:14 +0000 (20:12 +0200)
1  2 
intern/cycles/app/CMakeLists.txt

index 5c2bff96411fc4f51ea8a182a62cd8936ad6755d,34ff2988410ab2d5d85870c14f25860ca7a83971..6e47ebe2a9e8cd36151ebe528ffd3757f431288f
@@@ -60,10 -60,6 +60,10 @@@ link_directories(${OPENIMAGEIO_LIBPATH
                   ${TIFF_LIBPATH}
                   ${OPENEXR_LIBPATH})
  
 +if(WITH_OPENCOLORIO)
 +      link_directories(${OPENCOLORIO_LIBPATH})
 +endif()
 +
  add_definitions(${GL_DEFINITIONS})
  
  include_directories(${INC})
@@@ -85,6 -81,7 +85,6 @@@ macro(cycles_target_link_libraries targ
                target_link_libraries(${target} ${OPENSUBDIV_LIBRARIES})
        endif()
        if(WITH_OPENCOLORIO)
 -              link_directories(${OPENCOLORIO_LIBPATH})
                target_link_libraries(${target} ${OPENCOLORIO_LIBRARIES})
        endif()
        target_link_libraries(
@@@ -147,6 -144,9 +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)