mirror of
https://github.com/opencv/opencv.git
synced 2025-06-07 09:25:45 +08:00
Fixed jpeg-turbo diagnostics and build options in default configuration.
This commit is contained in:
parent
5bad694b7f
commit
bbd9059334
3
3rdparty/libjpeg-turbo/CMakeLists.txt
vendored
3
3rdparty/libjpeg-turbo/CMakeLists.txt
vendored
@ -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)
|
||||
|
@ -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")
|
||||
|
Loading…
Reference in New Issue
Block a user