Merge branch 'blender2.7'
authorBrecht Van Lommel <brechtvanlommel@gmail.com>
Sun, 27 Jan 2019 19:17:11 +0000 (20:17 +0100)
committerBrecht Van Lommel <brechtvanlommel@gmail.com>
Sun, 27 Jan 2019 19:17:11 +0000 (20:17 +0100)
1  2 
intern/cycles/app/CMakeLists.txt

@@@ -36,7 -36,7 +36,7 @@@ if(WITH_CYCLES_OSL
  endif()
  
  if(NOT CYCLES_STANDALONE_REPOSITORY)
-       list(APPEND LIBRARIES bf_intern_glew_mx bf_intern_guardedalloc)
+       list(APPEND LIBRARIES bf_intern_glew_mx bf_intern_guardedalloc bf_intern_numaapi)
  endif()
  
  if(WITH_CYCLES_LOGGING)
@@@ -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})
@@@ -88,6 -84,7 +88,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(