diff options
-rw-r--r-- | build_files/cmake/platform/platform_win32.cmake | 3 | ||||
-rw-r--r-- | intern/opencolorio/CMakeLists.txt | 4 |
2 files changed, 2 insertions, 5 deletions
diff --git a/build_files/cmake/platform/platform_win32.cmake b/build_files/cmake/platform/platform_win32.cmake index 8b9a48fca74..a0e91199c72 100644 --- a/build_files/cmake/platform/platform_win32.cmake +++ b/build_files/cmake/platform/platform_win32.cmake @@ -550,7 +550,6 @@ if(WITH_OPENIMAGEIO) set(OPENIMAGEIO_LIBRARIES ${OIIO_OPTIMIZED} ${OIIO_DEBUG}) set(OPENIMAGEIO_DEFINITIONS "-DUSE_TBB=0") - set(OPENCOLORIO_DEFINITIONS "-DDOpenColorIO_SKIP_IMPORTS") set(OPENIMAGEIO_IDIFF "${OPENIMAGEIO}/bin/idiff.exe") add_definitions(-DOIIO_STATIC_DEFINE) add_definitions(-DOIIO_NO_SSE=1) @@ -596,7 +595,7 @@ if(WITH_OPENCOLORIO) debug ${OPENCOLORIO_LIBPATH}/libexpatdMD.lib debug ${OPENCOLORIO_LIBPATH}/pystring_d.lib ) - set(OPENCOLORIO_DEFINITIONS) + set(OPENCOLORIO_DEFINITIONS "-DOpenColorIO_SKIP_IMPORTS") endif() if(WITH_OPENVDB) 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} ) |