[Bf-blender-cvs] [e67710b908b] master: deps/oiio: fix build issue on windows
Ray Molenkamp
noreply at git.blender.org
Wed Jul 27 04:59:56 CEST 2022
Commit: e67710b908b7e0c4846119ed0cc69f2395a08fb5
Author: Ray Molenkamp
Date: Tue Jul 26 20:59:44 2022 -0600
Branches: master
https://developer.blender.org/rBe67710b908b7e0c4846119ed0cc69f2395a08fb5
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.
===================================================================
M build_files/build_environment/cmake/openimageio.cmake
===================================================================
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
More information about the Bf-blender-cvs
mailing list