From ea159924dc9d0d508819cfff00e396b36b81a266 Mon Sep 17 00:00:00 2001 From: Shahram Najm Date: Mon, 6 Jun 2016 13:22:29 +0100 Subject: [PATCH] Pkgconfig: Add HAVE_LIBOPENJPEG --- CMakeLists.txt | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 4da30066a..e5e6dc08a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -323,12 +323,13 @@ endif() # pkg-config ecbuild_pkgconfig( - NAME eccodes - URL "https://software.ecmwf.int/wiki/display/ECC/" - DESCRIPTION "The ecCodes library" - LIBRARIES eccodes - VARIABLES HAVE_JPG HAVE_LIBJASPER HAVE_ECCODES_THREADS HAVE_NETCDF - HAVE_PYTHON HAVE_FORTRAN HAVE_PNG HAVE_AEC + NAME eccodes + URL "https://software.ecmwf.int/wiki/display/ECC/" + DESCRIPTION "The ecCodes library" + LIBRARIES eccodes + VARIABLES HAVE_JPG HAVE_LIBJASPER HAVE_LIBOPENJPEG + HAVE_ECCODES_THREADS HAVE_ECCODES_OMP_THREADS + HAVE_NETCDF HAVE_PYTHON HAVE_FORTRAN HAVE_PNG HAVE_AEC ) if( EC_HAVE_FORTRAN ) ecbuild_pkgconfig( @@ -337,8 +338,9 @@ if( EC_HAVE_FORTRAN ) LIBRARIES eccodes_f90 eccodes DESCRIPTION "The ecCodes library for Fortran 90" IGNORE_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/fortran ${PROJECT_BINARY_DIR}/fortran - VARIABLES HAVE_JPG HAVE_LIBJASPER HAVE_ECCODES_THREADS HAVE_NETCDF - HAVE_PYTHON HAVE_PNG HAVE_AEC + VARIABLES HAVE_JPG HAVE_LIBJASPER HAVE_LIBOPENJPEG + HAVE_ECCODES_THREADS HAVE_ECCODES_OMP_THREADS + HAVE_NETCDF HAVE_PYTHON HAVE_PNG HAVE_AEC ) endif()