Merge remote-tracking branch 'origin/master' into blender2.8
authorRay Molenkamp <github@lazydodo.com>
Tue, 4 Sep 2018 23:00:44 +0000 (17:00 -0600)
committerRay Molenkamp <github@lazydodo.com>
Tue, 4 Sep 2018 23:00:44 +0000 (17:00 -0600)
1  2 
intern/cycles/app/CMakeLists.txt

index 936da0075fe48f1b81eb2ba9cbc12ff424f4266b,4fd551b33c2e3475be03e3b27e66f95550425d1c..5c2bff96411fc4f51ea8a182a62cd8936ad6755d
@@@ -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(
@@@ -134,7 -131,7 +134,7 @@@ if(WITH_CYCLES_CUBIN_COMPILER
        # to be build to compile the cubins.
        if(MSVC AND NOT CMAKE_CL_64)
                message("Building with CUDA not supported on 32 bit, skipped")
-               set(WITH_CYCLES_CUDA_BINARIES OFF)
+               set(WITH_CYCLES_CUDA_BINARIES OFF CACHE BOOL "" FORCE)
        else()
                set(SRC
                        cycles_cubin_cc.cpp