From 04849f26b2c20465d475a29c86bb92351502c8f3 Mon Sep 17 00:00:00 2001 From: ocpalo Date: Tue, 13 Sep 2022 22:12:52 +0300 Subject: [PATCH] libjpegturbo simd extension update cmake flag --- 3rdparty/libjpeg-turbo/CMakeLists.txt | 5 ++--- CMakeLists.txt | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/3rdparty/libjpeg-turbo/CMakeLists.txt b/3rdparty/libjpeg-turbo/CMakeLists.txt index e316e24822..d55dcdf962 100644 --- a/3rdparty/libjpeg-turbo/CMakeLists.txt +++ b/3rdparty/libjpeg-turbo/CMakeLists.txt @@ -63,7 +63,7 @@ OCV_OPTION(ENABLE_LIBJPEG_TURBO_SIMD "Include SIMD extensions for libjpeg-turbo, 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) -set(IS_LIBJPEG_TURBO_SIMD_AVAILABLE 0 PARENT_SCOPE) +set(HAVE_LIBJPEG_TURBO_SIMD 0 PARENT_SCOPE) include(CheckCSourceCompiles) include(CheckIncludeFiles) @@ -185,7 +185,6 @@ if(CMAKE_SYSTEM_NAME STREQUAL "SunOS") endif() endif() -message(STATUS ${WITH_LIBJPEG_TURBO_SIMD}) if(ENABLE_LIBJPEG_TURBO_SIMD) add_subdirectory(src/simd) if(NEON_INTRINSICS) @@ -197,7 +196,7 @@ endif() if(WITH_SIMD) message(STATUS "SIMD extensions: ${CPU_TYPE} (WITH_SIMD = ${WITH_SIMD})") - set(IS_LIBJPEG_TURBO_SIMD_AVAILABLE 1 PARENT_SCOPE) + set(HAVE_LIBJPEG_TURBO_SIMD 1 PARENT_SCOPE) if(MSVC_IDE OR XCODE) set_source_files_properties(${SIMD_OBJS} PROPERTIES GENERATED 1) endif() diff --git a/CMakeLists.txt b/CMakeLists.txt index 129cf0aae2..2bc79cc2f4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1343,7 +1343,7 @@ if(WITH_JPEG OR HAVE_JPEG) status(" JPEG:" "build-${JPEG_LIBRARY} (ver ${JPEG_LIB_VERSION})") if(ENABLE_LIBJPEG_TURBO_SIMD) status(" SIMD Support Request:" "YES") - if(IS_LIBJPEG_TURBO_SIMD_AVAILABLE) + if(HAVE_LIBJPEG_TURBO_SIMD) status(" SIMD Support:" "YES") else() status(" SIMD Support:" "NO")