diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6469ca4f75..1a7fdcefa9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -235,19 +235,15 @@ endif()
 if (SvtEnc_FOUND AND NOT WITH_SvtEnc_PLUGIN)
     list(APPEND REQUIRES_PRIVATE "SvtAv1Enc")
 endif()
-if ((JPEG_DECODER_FOUND AND NOT WITH_JPEG_DECODER_PLUGIN) OR (JPEG_ENCODER_FOUND AND NOT WITH_JPEG_ENCODER_PLUGIN))
+if (JPEG_FOUND AND ((WITH_JPEG_DECODER AND NOT WITH_JPEG_DECODER_PLUGIN) OR (WITH_JPEG_ENCODER AND NOT WITH_JPEG_ENCODER_PLUGIN)))
     list(APPEND REQUIRES_PRIVATE "libjpeg")
 endif()
-# TODO: JPEG
-if (OpenJPEG_FOUND AND NOT WITH_OpenJPEG_PLUGIN)
+if (OpenJPEG_FOUND AND ((WITH_OpenJPEG_DECODER AND NOT WITH_OpenJPEG_DECODER_PLUGIN) OR (WITH_OpenJPEG_ENCODER AND NOT WITH_OpenJPEG_ENCODER_PLUGIN)))
     list(APPEND REQUIRES_PRIVATE "libopenjp2")
 endif()
 if (LIBSHARPYUV_FOUND)
     list(APPEND REQUIRES_PRIVATE "libsharpyuv")
 endif()
-if (OpenJPEG_FOUND AND NOT WITH_OpenJPEG_PLUGIN)
-    list(APPEND REQUIRES_PRIVATE "OpenJPEG")
-endif()
 list(JOIN REQUIRES_PRIVATE " " REQUIRES_PRIVATE)
 
 configure_file(libheif.pc.in ${CMAKE_CURRENT_BINARY_DIR}/libheif.pc @ONLY)