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

Fix OpenJPEG version in cmake scripts
pull/24755/head
Alexander Smorkalov 1 year ago committed by GitHub
commit 2320eef72d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 2
      CMakeLists.txt
  2. 1
      cmake/OpenCVFindLibsGrfmt.cmake

@ -1415,7 +1415,7 @@ endif()
if(HAVE_OPENJPEG) if(HAVE_OPENJPEG)
status(" JPEG 2000:" OpenJPEG_FOUND 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})" ELSE "build (ver ${OPENJPEG_VERSION})"
) )
elseif(HAVE_JASPER) elseif(HAVE_JASPER)

@ -202,6 +202,7 @@ if(WITH_OPENJPEG)
endif() endif()
else() else()
set(HAVE_OPENJPEG YES) set(HAVE_OPENJPEG YES)
set(OPENJPEG_VERSION "${OPENJPEG_MAJOR_VERSION}.${OPENJPEG_MINOR_VERSION}.${OPENJPEG_BUILD_VERSION}")
message(STATUS "Found system OpenJPEG: ${OPENJPEG_LIBRARIES} " message(STATUS "Found system OpenJPEG: ${OPENJPEG_LIBRARIES} "
"(found version \"${OPENJPEG_VERSION}\")") "(found version \"${OPENJPEG_VERSION}\")")
endif() endif()

Loading…
Cancel
Save