@@ -271,24 +271,11 @@ set(WEBP_ENABLE_SWAP_16BIT_CSP ON CACHE BOOL " " FORCE)
271271add_subdirectory (libwebp EXCLUDE_FROM_ALL )
272272
273273set (WebP_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR} /libwebp/src)
274- get_target_property (WebP_LIBRARY webpdecoder IMPORTED_LOCATION )
275-
276- # Compile libtiff
277- set (BUILD_SHARED_LIBS OFF CACHE BOOL " " FORCE )
278- set (tiff-tools OFF CACHE BOOL " " FORCE )
279- set (tiff-tests OFF CACHE BOOL " " FORCE )
280- set (tiff-contrib OFF CACHE BOOL " " FORCE )
281- set (tiff-docs OFF CACHE BOOL " " FORCE )
282- set (tiff-deprecated OFF CACHE BOOL " " FORCE )
283- set (tiff-install OFF CACHE BOOL " " FORCE )
284- # Disable lzma, webp, and zstd support in libtiff as we don't need them.
285- set (libdeflate OFF CACHE BOOL " " FORCE )
286- set (jbig OFF CACHE BOOL " " FORCE )
287- set (lerc OFF CACHE BOOL " " FORCE )
288- set (lzma OFF CACHE BOOL " " FORCE )
289- set (zstd OFF CACHE BOOL " " FORCE )
290- set (HAVE_JPEGTURBO_DUAL_MODE_8_12 TRUE CACHE BOOL " " FORCE )
291- add_subdirectory (libtiff EXCLUDE_FROM_ALL )
274+ set (WebP_LIBRARY webpdecoder)
275+ add_library (webp_wrapper INTERFACE )
276+ target_link_libraries (webp_wrapper INTERFACE webpdecoder )
277+ target_include_directories (webp_wrapper INTERFACE ${WebP_INCLUDE_DIR} )
278+ add_library (WebP::webp ALIAS webp_wrapper )
292279
293280# Compile OpenEXR
294281set (IMATH_INSTALL OFF CACHE BOOL " " FORCE )
@@ -299,6 +286,13 @@ set(LIBDEFLATE_BUILD_SHARED_LIB OFF CACHE BOOL " " FORCE)
299286set (LIBDEFLATE_BUILD_GZIP OFF CACHE BOOL " " FORCE )
300287add_subdirectory (libdeflate EXCLUDE_FROM_ALL )
301288
289+ set (Deflate_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR} /libdeflate)
290+ set (Deflate_LIBRARY libdeflate_static)
291+ add_library (deflate_wrapper INTERFACE )
292+ target_link_libraries (deflate_wrapper INTERFACE libdeflate_static )
293+ target_include_directories (deflate_wrapper INTERFACE ${Deflate_INCLUDE_DIR} )
294+ add_library (Deflate::Deflate ALIAS deflate_wrapper )
295+
302296set (OPENEXR_FORCE_INTERNAL_DEFLATE ON CACHE BOOL " " FORCE )
303297set (EXR_DEFLATE_LIB libdeflate::libdeflate_static)
304298
@@ -314,6 +308,22 @@ if (CMAKE_CXX_COMPILER_ID MATCHES "GNU")
314308 target_compile_definitions (OpenEXRCore PRIVATE _GNU_SOURCE )
315309endif ()
316310
311+ # Compile libtiff
312+ set (BUILD_SHARED_LIBS OFF CACHE BOOL " " FORCE )
313+ set (tiff-tools OFF CACHE BOOL " " FORCE )
314+ set (tiff-tests OFF CACHE BOOL " " FORCE )
315+ set (tiff-contrib OFF CACHE BOOL " " FORCE )
316+ set (tiff-docs OFF CACHE BOOL " " FORCE )
317+ set (tiff-deprecated OFF CACHE BOOL " " FORCE )
318+ set (tiff-install OFF CACHE BOOL " " FORCE )
319+ # Disable lzma, webp, and zstd support in libtiff as we don't need them.
320+ set (jbig OFF CACHE BOOL " " FORCE )
321+ set (lerc OFF CACHE BOOL " " FORCE )
322+ set (lzma OFF CACHE BOOL " " FORCE )
323+ set (zstd OFF CACHE BOOL " " FORCE )
324+ set (HAVE_JPEGTURBO_DUAL_MODE_8_12 TRUE CACHE BOOL " " FORCE )
325+ add_subdirectory (libtiff EXCLUDE_FROM_ALL )
326+
317327# Compile clip
318328set (CLIP_EXAMPLES OFF CACHE BOOL " " FORCE )
319329set (CLIP_TESTS OFF CACHE BOOL " " FORCE )
0 commit comments