diff options
| author | Ray Molenkamp <github@lazydodo.com> | 2019-11-08 19:01:00 +0300 |
|---|---|---|
| committer | Ray Molenkamp <github@lazydodo.com> | 2019-11-08 19:01:00 +0300 |
| commit | a67aa11b12ec27a1abb9badb513a516c8d90daf5 (patch) | |
| tree | 19bb438d8ec845427968f30240c8c846eca156bf /intern/cycles/CMakeLists.txt | |
| parent | e408a62c2a4b1bec44be06b533b20ce9822d92f2 (diff) | |
Windows: Switch to the dynamic C runtime
This change switches windows to the dynamic C runtime
avoiding issues coming from mixing the static and dynamic
runtime like the ones outlined in [1]
[1] https://developer.blender.org/D5387#122165
Differential Revision: https://developer.blender.org/D6175
Reviewed by: @Sergey
Diffstat (limited to 'intern/cycles/CMakeLists.txt')
| -rw-r--r-- | intern/cycles/CMakeLists.txt | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/intern/cycles/CMakeLists.txt b/intern/cycles/CMakeLists.txt index a32911568c5..6f6bd7ec2cc 100644 --- a/intern/cycles/CMakeLists.txt +++ b/intern/cycles/CMakeLists.txt @@ -362,6 +362,9 @@ if(WITH_OPENCOLORIO) SYSTEM ${OPENCOLORIO_INCLUDE_DIRS} ) + if(WIN32) + add_definitions(-DOpenColorIO_STATIC) + endif() endif() if(WITH_CYCLES_STANDALONE OR WITH_CYCLES_NETWORK OR WITH_CYCLES_CUBIN_COMPILER) |