Defaults: don't use Filmic view transform in Video Editing template.
[blender.git] / CMakeLists.txt
index 3218bf9ba4bbb5532a4eab97ee90b7b8b5014d3e..1813f9a15efab88acf3f92f506b7ed8d7989c7d7 100644 (file)
@@ -411,7 +411,7 @@ option(WITH_CYCLES_CUDA_BINARIES    "Build Cycles CUDA binaries" OFF)
 option(WITH_CYCLES_CUBIN_COMPILER      "Build cubins with nvrtc based compiler instead of nvcc" OFF)
 option(WITH_CYCLES_CUDA_BUILD_SERIAL "Build cubins one after another (useful on machines with limited RAM)" OFF)
 mark_as_advanced(WITH_CYCLES_CUDA_BUILD_SERIAL)
-set(CYCLES_CUDA_BINARIES_ARCH sm_30 sm_35 sm_37 sm_50 sm_52 sm_60 sm_61 sm_70 sm_72 sm_75 CACHE STRING "CUDA architectures to build binaries for")
+set(CYCLES_CUDA_BINARIES_ARCH sm_30 sm_35 sm_37 sm_50 sm_52 sm_60 sm_61 sm_70 sm_75 CACHE STRING "CUDA architectures to build binaries for")
 mark_as_advanced(CYCLES_CUDA_BINARIES_ARCH)
 unset(PLATFORM_DEFAULT)
 option(WITH_CYCLES_LOGGING     "Build Cycles with logging support" ON)
@@ -1057,8 +1057,11 @@ if(WITH_GL_PROFILE_ES20)
        endif()
 
 else()
-       list(APPEND BLENDER_GL_LIBRARIES "${OPENGL_LIBRARIES}")
-
+       if(OpenGL_GL_PREFERENCE STREQUAL "LEGACY" AND OPENGL_gl_LIBRARY)
+               list(APPEND BLENDER_GL_LIBRARIES ${OPENGL_gl_LIBRARY})
+       else()
+               list(APPEND BLENDER_GL_LIBRARIES ${OPENGL_opengl_LIBRARY} ${OPENGL_glx_LIBRARY})
+       endif()
 endif()
 
 if(WITH_GL_EGL)