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

ECC-1040: Implement a way of choosing if OpenJPEG or Jasper is linked

This commit is contained in:
Shahram Najm 2019-12-13 15:44:54 +00:00
parent 42aee0ee4a
commit 2c10828495
1 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
CMakeLists.txt
View File

@ -78,6 +78,18 @@ ecbuild_add_option( FEATURE JPG
DESCRIPTION "Support for JPG decoding/encoding"
DEFAULT ON
)
# Options related to JPG. The Jasper and OpenJPEG libraries
ecbuild_add_option( FEATURE JPG_LIBJASPER
DESCRIPTION "Support for JPG decoding/encoding with the Jasper library"
CONDITION ENABLE_JPG
DEFAULT ON
)
ecbuild_add_option( FEATURE JPG_LIBOPENJPEG
DESCRIPTION "Support for JPG decoding/encoding with the OpenJPEG library"
CONDITION ENABLE_JPG
DEFAULT ON
)
ecbuild_add_option( FEATURE PNG
DESCRIPTION "Support for PNG decoding/encoding"
@ -192,8 +204,8 @@ set( HAVE_LIBOPENJPEG 0 )
if( ENABLE_JPG )
# Note: This is a deprecated feature but we need it to find Jasper at ECMWF.
# ecbuild_add_extra_search_paths modifies CMAKE_PREFIX_PATH
# Note: ecbuild_add_extra_search_paths is a deprecated feature but we need it to find Jasper at ECMWF.
# It modifies CMAKE_PREFIX_PATH
# which can affect future package discovery if not undone by the caller.
# The current CMAKE_PREFIX_PATH is backed up as _CMAKE_PREFIX_PATH
#
@ -205,7 +217,7 @@ if( ENABLE_JPG )
find_package( OpenJPEG )
if( JASPER_FOUND )
if( JASPER_FOUND AND ENABLE_JPG_LIBJASPER )
list( APPEND ECCODES_TPLS Jasper )
set( HAVE_JPEG 1 )
set( HAVE_LIBJASPER 1 )
@ -213,13 +225,15 @@ if( ENABLE_JPG )
string(REGEX REPLACE "^([0-9]+)\\.[0-9]+\\.[0-9]+.*" "\\1" JASPER_VERSION_MAJOR "${JASPER_VERSION_STRING}")
endif()
if( OPENJPEG_FOUND )
if( OPENJPEG_FOUND AND ENABLE_JPG_LIBOPENJPEG )
list( APPEND ECCODES_TPLS OpenJPEG )
set( HAVE_JPEG 1 )
set( HAVE_LIBOPENJPEG 1 )
endif()
ecbuild_info(" HAVE_JPEG=${HAVE_JPEG}")
ecbuild_info(" HAVE_LIBJASPER=${HAVE_LIBJASPER}")
ecbuild_info(" HAVE_LIBOPENJPEG=${HAVE_LIBOPENJPEG}")
endif()