Merge pull request #11 in ECCODES/eccodes from fix/ECCODES-404-jpg-tests to develop

* commit '0abc5a8b8516f5fe611cb3a2f3808e34f452e67b':
  ECC-404 Use HAVE_JPEG to test for JPG feature

CMakeLists.txt

@@ -344,7 +344,7 @@ ecbuild_pkgconfig(
   DESCRIPTION    "The ecCodes library"
   LIBRARIES      eccodes
   IGNORE_INCLUDE_DIRS ${PYTHON_INCLUDE_DIRS} ${NUMPY_INCLUDE_DIRS} ${NETCDF_INCLUDE_DIRS}
-  VARIABLES      HAVE_JPG HAVE_LIBJASPER HAVE_LIBOPENJPEG
+  VARIABLES      HAVE_JPEG HAVE_LIBJASPER HAVE_LIBOPENJPEG
                  HAVE_ECCODES_THREADS HAVE_ECCODES_OMP_THREADS
                  HAVE_NETCDF HAVE_PYTHON HAVE_FORTRAN HAVE_PNG HAVE_AEC
 )
@@ -356,7 +356,7 @@ if( EC_HAVE_FORTRAN )
     DESCRIPTION         "The ecCodes library for Fortran 90"
     IGNORE_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/fortran ${PROJECT_BINARY_DIR}/fortran
                         ${PYTHON_INCLUDE_DIRS} ${NUMPY_INCLUDE_DIRS} ${NETCDF_INCLUDE_DIRS}
-    VARIABLES           HAVE_JPG HAVE_LIBJASPER HAVE_LIBOPENJPEG
+    VARIABLES           HAVE_JPEG HAVE_LIBJASPER HAVE_LIBOPENJPEG
                         HAVE_ECCODES_THREADS HAVE_ECCODES_OMP_THREADS
                         HAVE_NETCDF HAVE_PYTHON HAVE_PNG HAVE_AEC
   )

tests/grib_png.sh

@@ -22,7 +22,7 @@ files="
  regular_latlon_surface_constant.grib2
 "
 
-if [ $HAVE_JPG -eq 1 ]; then
+if [ $HAVE_JPEG -eq 1 ]; then
  files="multi.grib2 v.grib2"$files
 fi
 

tests/grib_util_set_spec.sh

@@ -51,8 +51,8 @@ grib_check_key_equals $outfile section2Used 0
 # Convert to edition2 and use JPEG for packing
 # Don't complain due to unbound variable
 set +u
-if [ x"$HAVE_JPG" != "x" ]; then
-  if [ $HAVE_JPG -eq 1 ]; then
+if [ x"$HAVE_JPEG" != "x" ]; then
+  if [ $HAVE_JPEG -eq 1 ]; then
     infile=../data/latlon.grib
     ${test_dir}grib_util_set_spec -e 2 -p grid_jpeg $infile $outfile > /dev/null
     res=`${tools_dir}grib_get -p edition,section2Used,packingType $outfile`

tests/include.ctest.sh.in

@@ -29,6 +29,6 @@ ECCODES_SAMPLES_PATH=${samp_dir}
 export ECCODES_SAMPLES_PATH
 
 # Options
-HAVE_JPG=@HAVE_JPG@
+HAVE_JPEG=@HAVE_JPEG@
 HAVE_PNG=@HAVE_PNG@
 HAVE_AEC=@HAVE_AEC@