diff options
| author | Ray Molenkamp <github@lazydodo.com> | 2021-06-23 17:45:37 +0300 |
|---|---|---|
| committer | Ray Molenkamp <github@lazydodo.com> | 2021-06-23 17:45:37 +0300 |
| commit | 7561e3dad064332a430ace005f21c9d3aca5535d (patch) | |
| tree | 1830df88e587d2a024375b55dea2c3bdb201573d /build_files | |
| parent | 354ecc2f1e3a23edb6987b59257a60239b6c68c7 (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 'build_files')
| -rw-r--r-- | build_files/cmake/platform/platform_win32.cmake | 3 |
1 files changed, 1 insertions, 2 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) |