core
/
eccodes
mirror of https://github.com/ecmwf/eccodes.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Correct spelling of JasPer library

This commit is contained in:
Shahram Najm 2023-08-04 22:19:53 +01:00
parent 32e95711c5
commit 731e381ef6
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
CMakeLists.txt
View File

@ -102,9 +102,9 @@ ecbuild_add_option( FEATURE BUILD_TOOLS
ecbuild_add_option( FEATURE JPG ecbuild_add_option( FEATURE JPG
DESCRIPTION "Support for JPG decoding/encoding" DESCRIPTION "Support for JPG decoding/encoding"
DEFAULT ON ) DEFAULT ON )
# Options related to JPG. The Jasper and OpenJPEG libraries # Options related to JPG. The JasPer and OpenJPEG libraries
ecbuild_add_option( FEATURE JPG_LIBJASPER ecbuild_add_option( FEATURE JPG_LIBJASPER
DESCRIPTION "Support for JPG decoding/encoding with the Jasper library" DESCRIPTION "Support for JPG decoding/encoding with the JasPer library"
CONDITION ENABLE_JPG CONDITION ENABLE_JPG
DEFAULT ON ) DEFAULT ON )
ecbuild_add_option( FEATURE JPG_LIBOPENJPEG ecbuild_add_option( FEATURE JPG_LIBOPENJPEG
@ -217,7 +217,7 @@ set( HAVE_LIBJASPER 0 )
set( HAVE_LIBOPENJPEG 0 ) set( HAVE_LIBOPENJPEG 0 )
if( ENABLE_JPG ) if( ENABLE_JPG )
# Note: The function ecbuild_add_extra_search_paths is deprecated but we need it to find Jasper at ECMWF. # Note: The function ecbuild_add_extra_search_paths is deprecated but we need it to find JasPer at ECMWF.
# It modifies CMAKE_PREFIX_PATH # It modifies CMAKE_PREFIX_PATH
# which can affect future package discovery if not undone by the caller. # which can affect future package discovery if not undone by the caller.
# The current CMAKE_PREFIX_PATH is backed up as _CMAKE_PREFIX_PATH # The current CMAKE_PREFIX_PATH is backed up as _CMAKE_PREFIX_PATH
@ -234,7 +234,7 @@ if( ENABLE_JPG )
list( APPEND ECCODES_TPLS Jasper ) list( APPEND ECCODES_TPLS Jasper )
set( HAVE_JPEG 1 ) set( HAVE_JPEG 1 )
set( HAVE_LIBJASPER 1 ) set( HAVE_LIBJASPER 1 )
# Extract Jasper's major version number to enable conditional code. See ECC-396 # Extract JasPer's major version number to enable conditional code. See ECC-396
string(REGEX REPLACE "^([0-9]+)\\.[0-9]+\\.[0-9]+.*" "\\1" JASPER_VERSION_MAJOR "${JASPER_VERSION_STRING}") string(REGEX REPLACE "^([0-9]+)\\.[0-9]+\\.[0-9]+.*" "\\1" JASPER_VERSION_MAJOR "${JASPER_VERSION_STRING}")
endif() endif()