mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2025-06-17 23:51:16 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Fix OpenJPEG version in cmake scripts
This commit is contained in:
Alexander Smorkalov 2023-12-22 16:51:45 +03:00 committed by GitHub
commit 2320eef72d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -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)

1
cmake/OpenCVFindLibsGrfmt.cmake
View File

@ -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()