From bbd905933407a0c66a71588c65b6e868a09e09da Mon Sep 17 00:00:00 2001 From: Alexander Smorkalov Date: Wed, 10 Apr 2024 16:19:59 +0300 Subject: [PATCH] Fixed jpeg-turbo diagnostics and build options in default configuration. --- 3rdparty/libjpeg-turbo/CMakeLists.txt | 3 +-- CMakeLists.txt | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/3rdparty/libjpeg-turbo/CMakeLists.txt b/3rdparty/libjpeg-turbo/CMakeLists.txt index 6e508c8860..a995707852 100644 --- a/3rdparty/libjpeg-turbo/CMakeLists.txt +++ b/3rdparty/libjpeg-turbo/CMakeLists.txt @@ -56,8 +56,7 @@ if(MSVC_IDE AND CMAKE_GENERATOR_PLATFORM MATCHES "arm64") set(CPU_TYPE arm64) endif() -OCV_OPTION(ENABLE_LIBJPEG_TURBO_SIMD "Include SIMD extensions for libjpeg-turbo, if available for this platform" (NOT CV_DISABLE_OPTIMIZATION) - VISIBLE_IF BUILD_JPEG) +OCV_OPTION(ENABLE_LIBJPEG_TURBO_SIMD "Include SIMD extensions for libjpeg-turbo, if available for this platform" (NOT CV_DISABLE_OPTIMIZATION)) option(WITH_ARITH_ENC "Include arithmetic encoding support when emulating the libjpeg v6b API/ABI" TRUE) option(WITH_ARITH_DEC "Include arithmetic decoding support when emulating the libjpeg v6b API/ABI" TRUE) set(WITH_SIMD 1) diff --git a/CMakeLists.txt b/CMakeLists.txt index e20f68cca0..61f4ee2c15 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1438,7 +1438,7 @@ status(" ZLib:" ZLIB_FOUND THEN "${ZLIB_LIBRARIES} (ver ${ZLIB_VERSION_STRI if(WITH_JPEG OR HAVE_JPEG) if(NOT HAVE_JPEG) status(" JPEG:" NO) - elseif(BUILD_JPEG) + elseif(BUILD_JPEG OR NOT JPEG_FOUND) status(" JPEG:" "build-${JPEG_LIBRARY} (ver ${JPEG_LIB_VERSION})") if(ENABLE_LIBJPEG_TURBO_SIMD) status(" SIMD Support Request:" "YES")