From 9e4b92f3199ca115fa1931f7b75878cb11e87548 Mon Sep 17 00:00:00 2001 From: Even Rouault Date: Wed, 18 May 2022 01:21:09 +0200 Subject: [PATCH] CMake: internal libtiff: fix build without JPEG (fixes #5741) --- frmts/gtiff/libtiff/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frmts/gtiff/libtiff/CMakeLists.txt b/frmts/gtiff/libtiff/CMakeLists.txt index 35b22e964216..26fae9c6ffb8 100644 --- a/frmts/gtiff/libtiff/CMakeLists.txt +++ b/frmts/gtiff/libtiff/CMakeLists.txt @@ -86,7 +86,7 @@ if (NOT GDAL_USE_ZLIB_INTERNAL) gdal_target_link_libraries(libtiff PRIVATE ZLIB::ZLIB) endif () -if (NOT GDAL_USE_JPEG_INTERNAL) +if (GDAL_USE_JPEG AND NOT GDAL_USE_JPEG_INTERNAL) # Use a separate object library so that external libjpeg headers are only applied to tif_jpeg.c and tif_ojpeg.c, but # not tif_jpeg_12.c ! add_library(libtiff_jpeg OBJECT tif_jpeg.c tif_ojpeg.c)