From 4ee4479cd797595961a07484dd2c6a07f4274c11 Mon Sep 17 00:00:00 2001 From: Letu Ren Date: Fri, 22 Dec 2023 20:14:08 +0800 Subject: [PATCH] Fix OpenJPEG version in cmake scripts Currently, if OpenJPEG is found, only version information in summary is correct and the information right after `find_package(OpenJPEG)` is wrong. ``` -- Found system OpenJPEG: openjp2 (found version "") ``` The reason is OpenJPEGConfig.cmake only sets `OPENJPEG_MAJOR_VERSION`, `OPENJPEG_MINOR_VERSION` and `OPENJPEG_BUILD_VERSION` but not `OPENJPEG_VERSION`. --- CMakeLists.txt | 2 +- cmake/OpenCVFindLibsGrfmt.cmake | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 300e17c9dd..70ee9f9a15 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1415,7 +1415,7 @@ endif() if(HAVE_OPENJPEG) status(" JPEG 2000:" OpenJPEG_FOUND - THEN "OpenJPEG (ver ${OPENJPEG_MAJOR_VERSION}.${OPENJPEG_MINOR_VERSION}.${OPENJPEG_BUILD_VERSION})" + THEN "OpenJPEG (ver ${OPENJPEG_VERSION})" ELSE "build (ver ${OPENJPEG_VERSION})" ) elseif(HAVE_JASPER) diff --git a/cmake/OpenCVFindLibsGrfmt.cmake b/cmake/OpenCVFindLibsGrfmt.cmake index 52dd2fdbd4..65dc3539f1 100644 --- a/cmake/OpenCVFindLibsGrfmt.cmake +++ b/cmake/OpenCVFindLibsGrfmt.cmake @@ -202,6 +202,7 @@ if(WITH_OPENJPEG) endif() else() set(HAVE_OPENJPEG YES) + set(OPENJPEG_VERSION "${OPENJPEG_MAJOR_VERSION}.${OPENJPEG_MINOR_VERSION}.${OPENJPEG_BUILD_VERSION}") message(STATUS "Found system OpenJPEG: ${OPENJPEG_LIBRARIES} " "(found version \"${OPENJPEG_VERSION}\")") endif()