Merge pull request #24749 from FantasqueX:fix-openjpeg-version

Fix OpenJPEG version in cmake scripts
1 year ago · 2320eef72d
parent a050285058 4ee4479cd7
commit 2320eef72d
2 changed files with 2 additions and 1 deletions
--- 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)
--- 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()