mirror of https://github.com/ecmwf/eccodes.git
ECC-1037: eccodes should build with openjpeg 2.3
This commit is contained in:
parent
a142baacd6
commit
33b6aa0f62
|
@ -6,7 +6,7 @@
|
||||||
# granted to it by virtue of its status as an intergovernmental organisation nor
|
# granted to it by virtue of its status as an intergovernmental organisation nor
|
||||||
# does it submit to any jurisdiction.
|
# does it submit to any jurisdiction.
|
||||||
|
|
||||||
# - Try to find the OpenJPEG includes and library (version 1.5.x or 2.1.x)
|
# - Try to find the OpenJPEG includes and library (version 1.5.x, 2.1.x, 2.2.x, 2.3.x)
|
||||||
# This module defines
|
# This module defines
|
||||||
#
|
#
|
||||||
# OPENJPEG_FOUND - System has OpenJPEG
|
# OPENJPEG_FOUND - System has OpenJPEG
|
||||||
|
@ -20,10 +20,10 @@
|
||||||
|
|
||||||
# Note: OpenJPEG has a version-specific subdirectory in the include
|
# Note: OpenJPEG has a version-specific subdirectory in the include
|
||||||
# e.g. include/openjpeg-2.0 or include/openjpeg-2.1.
|
# e.g. include/openjpeg-2.0 or include/openjpeg-2.1.
|
||||||
# Only version 1.5.x and 2.1.x are supported.
|
# Only version 1.5.x and 2.[123].x are supported.
|
||||||
# The library name is different for 1.x (libopenjpeg) and 2.x (libopenjp2).
|
# The library name is different for 1.x (libopenjpeg) and 2.x (libopenjp2).
|
||||||
|
|
||||||
set( _suff include include/openjpeg include/openjpeg-1.5 include/openjpeg-2.1 )
|
set( _suff include include/openjpeg include/openjpeg-1.5 include/openjpeg-2.1 include/openjpeg-2.2 include/openjpeg-2.3)
|
||||||
find_path( OPENJPEG_INCLUDE_DIR openjpeg.h
|
find_path( OPENJPEG_INCLUDE_DIR openjpeg.h
|
||||||
PATHS ${OPENJPEG_PATH} ENV OPENJPEG_PATH
|
PATHS ${OPENJPEG_PATH} ENV OPENJPEG_PATH
|
||||||
${OPENJPEG_DIR} ENV OPENJPEG_DIR
|
${OPENJPEG_DIR} ENV OPENJPEG_DIR
|
||||||
|
|
Loading…
Reference in New Issue