diff options
| author | Ray Molenkamp <github@lazydodo.com> | 2022-07-27 05:59:44 +0300 |
|---|---|---|
| committer | Ray Molenkamp <github@lazydodo.com> | 2022-07-27 05:59:44 +0300 |
| commit | e67710b908b7e0c4846119ed0cc69f2395a08fb5 (patch) | |
| tree | 130cbf49e815f346b1c3bda77a502cce8848288b /build_files | |
| parent | f43a8835dc9ba96517f9e77c17845dc095273e68 (diff) | |
deps/oiio: fix build issue on windows
tiff now outputs tiffd.lib for debug builds
oiio was not informed about this and had
a build error because of it.
Diffstat (limited to 'build_files')
| -rw-r--r-- | build_files/build_environment/cmake/openimageio.cmake | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/build_files/build_environment/cmake/openimageio.cmake b/build_files/build_environment/cmake/openimageio.cmake index b7d7ce689a4..26881488039 100644 --- a/build_files/build_environment/cmake/openimageio.cmake +++ b/build_files/build_environment/cmake/openimageio.cmake @@ -18,9 +18,15 @@ if(WIN32) set(PNG_LIBNAME libpng16_static${LIBEXT}) set(OIIO_SIMD_FLAGS -DUSE_SIMD=sse2) set(OPENJPEG_POSTFIX _msvc) + if(BUILD_MODE STREQUAL Debug) + set(TIFF_POSTFIX d) + else() + set(TIFF_POSTFIX) + endif() else() set(PNG_LIBNAME libpng${LIBEXT}) set(OIIO_SIMD_FLAGS) + set(TIFF_POSTFIX) endif() if(MSVC) @@ -65,7 +71,7 @@ set(OPENIMAGEIO_EXTRA_ARGS -DZLIB_INCLUDE_DIR=${LIBDIR}/zlib/include -DPNG_LIBRARY=${LIBDIR}/png/lib/${PNG_LIBNAME} -DPNG_PNG_INCLUDE_DIR=${LIBDIR}/png/include - -DTIFF_LIBRARY=${LIBDIR}/tiff/lib/${LIBPREFIX}tiff${LIBEXT} + -DTIFF_LIBRARY=${LIBDIR}/tiff/lib/${LIBPREFIX}tiff${TIFF_POSTFIX}${LIBEXT} -DTIFF_INCLUDE_DIR=${LIBDIR}/tiff/include -DJPEG_LIBRARY=${LIBDIR}/jpeg/lib/${JPEG_LIBRARY} -DJPEG_INCLUDE_DIR=${LIBDIR}/jpeg/include |