blob: 1d72e1b4733a74b3486694aa9c2e8dc1536d7eb9 [file] [log] [blame]
diff -Naur blender-2.82/intern/cycles/render/CMakeLists.txt.orig blender-2.82/intern/cycles/render/CMakeLists.txt
--- blender-2.82/intern/cycles/render/CMakeLists.txt.orig 2019-12-04 14:00:31.000000000 +0300
+++ blender-2.82/intern/cycles/render/CMakeLists.txt 2020-02-12 13:15:01.000000000 +0300
@@ -106,9 +106,6 @@
SYSTEM
${OPENCOLORIO_INCLUDE_DIRS}
)
- if(WIN32)
- add_definitions(-DOpenColorIO_STATIC)
- endif()
endif()
if(WITH_OPENVDB)
--- blender-2.90.1/source/blender/blenlib/CMakeLists.txt.orig 2020-02-18 11:21:38.444947500 +0300
+++ blender-2.90.1/source/blender/blenlib/CMakeLists.txt 2020-02-18 11:22:09.099292800 +0300
@@ -311,6 +311,7 @@
)
list(APPEND LIB
bf_intern_utfconv
+ version
)
list(APPEND SRC
intern/system_win32.c
--- blender-2.82/source/blender/gpu/CMakeLists.txt.orig 2020-02-18 11:21:38.444947500 +0300
+++ blender-2.82/source/blender/gpu/CMakeLists.txt 2020-02-18 11:22:09.099292800 +0300
@@ -132,7 +132,11 @@
${BLENDER_GL_LIBRARIES}
)
-if(NOT WITH_SYSTEM_GLEW)
+if(WITH_SYSTEM_GLEW)
+ list(APPEND LIB
+ ${GLEW_LIBRARY}
+ )
+else()
list(APPEND LIB
${BLENDER_GLEW_LIBRARIES}
)
--- blender-2.82/source/blender/render/CMakeLists.txt.orig 2020-02-18 12:07:41.740701100 +0300
+++ blender-2.82/source/blender/render/CMakeLists.txt 2020-02-18 12:09:20.740485400 +0300
@@ -100,6 +100,12 @@
add_definitions(-DWITH_FREESTYLE)
endif()
+if(WITH_OPENCOLORIO)
+ list(APPEND LIB
+ ${OPENCOLORIO_LIBRARIES}
+ )
+endif()
+
if(WITH_INTERNATIONAL)
add_definitions(-DWITH_INTERNATIONAL)
endif()
--- blender-2.82/intern/cycles/util/CMakeLists.txt.orig 2020-02-18 12:00:41.215804900 +0300
+++ blender-2.82/intern/cycles/util/CMakeLists.txt 2020-02-18 12:03:21.654539300 +0300
@@ -29,6 +29,7 @@
set(LIB
${TBB_LIBRARIES}
+ ${OPENIMAGEIO_LIBRARIES}
)
if(WITH_CYCLES_STANDALONE)