Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRay Molenkamp <github@lazydodo.com>2021-06-23 17:45:37 +0300
committerRay Molenkamp <github@lazydodo.com>2021-06-23 17:45:37 +0300
commit7561e3dad064332a430ace005f21c9d3aca5535d (patch)
tree1830df88e587d2a024375b55dea2c3bdb201573d /intern/opencolorio
parent354ecc2f1e3a23edb6987b59257a60239b6c68c7 (diff)
CMake/win: Fix linker issue with OCIO
In certain CMake configurations it was possible that OCIO gave linker errors due to it thinking it was using the shared library rather than the static library we ship.
Diffstat (limited to 'intern/opencolorio')
-rw-r--r--intern/opencolorio/CMakeLists.txt4
1 files changed, 1 insertions, 3 deletions
diff --git a/intern/opencolorio/CMakeLists.txt b/intern/opencolorio/CMakeLists.txt
index d2336692d22..0b46ae471d2 100644
--- a/intern/opencolorio/CMakeLists.txt
+++ b/intern/opencolorio/CMakeLists.txt
@@ -48,6 +48,7 @@ if(WITH_OPENCOLORIO)
)
add_definitions(${GL_DEFINITIONS})
+ add_definitions(${OPENCOLORIO_DEFINITIONS})
list(APPEND INC_SYS
${OPENCOLORIO_INCLUDE_DIRS}
@@ -67,9 +68,6 @@ if(WITH_OPENCOLORIO)
list(APPEND INC_SYS
${BOOST_INCLUDE_DIR}
)
- add_definitions(
- -DOpenColorIO_STATIC
- )
list(APPEND LIB
${BOOST_LIBRARIES}
)