diff options
| author | Clément Foucault <foucault.clem@gmail.com> | 2022-02-19 00:29:31 +0300 |
|---|---|---|
| committer | Clément Foucault <foucault.clem@gmail.com> | 2022-02-19 00:29:31 +0300 |
| commit | e81dda4f3865827f3b3039caa57d9e97e2019781 (patch) | |
| tree | d399aecda5c8057ea3674d826521b009bd023d46 /source/blender/gpu/CMakeLists.txt | |
| parent | 7f68185d347b01a75836eb7372181a1196f546aa (diff) | |
| parent | 93cc892470109ab505f00f0b9d2bddb1a0a8179d (diff) | |
Merge branch 'blender-v3.1-release'
# Conflicts:
# intern/opencolorio/ocio_shader_shared.hh
Diffstat (limited to 'source/blender/gpu/CMakeLists.txt')
| -rw-r--r-- | source/blender/gpu/CMakeLists.txt | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/source/blender/gpu/CMakeLists.txt b/source/blender/gpu/CMakeLists.txt index f2e189777f0..e883a12a5b2 100644 --- a/source/blender/gpu/CMakeLists.txt +++ b/source/blender/gpu/CMakeLists.txt @@ -452,21 +452,12 @@ if(WITH_IMAGE_DDS) add_definitions(-DWITH_DDS) endif() -if(WITH_OPENCOLORIO) - add_definitions(-DWITH_OCIO) -endif() - blender_add_lib(bf_gpu "${SRC}" "${INC}" "${INC_SYS}" "${LIB}") target_link_libraries(bf_gpu PUBLIC bf_draw_shaders bf_gpu_shaders ) -if(WITH_OPENCOLORIO) - target_link_libraries(bf_gpu PUBLIC bf_ocio_shaders) -endif() - - if(CXX_WARN_NO_SUGGEST_OVERRIDE) target_compile_options(bf_gpu PRIVATE $<$<COMPILE_LANGUAGE:CXX>:-Wsuggest-override>) endif() |