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

Merge branch 'develop' of github.com:ecmwf/eccodes into develop

This commit is contained in:
Shahram Najm 2022-04-08 16:44:54 +01:00
parent 7566c8f0ce 7e588f53c7
commit 225492cab6
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/CMakeLists.txt
View File

@ -434,7 +434,7 @@ ecbuild_add_library( TARGET eccodes
# griby.c gribl.c
${eccodes_src_files}
#PRIVATE_LIBS ${ECCODES_EXTRA_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} ${CMATH_LIBRARIES}
PRIVATE_INCLUDES "${AEC_INCLUDE_DIRS}"
PRIVATE_INCLUDES "${AEC_INCLUDE_DIRS}" "${PNG_INCLUDE_DIRS}"
PRIVATE_LIBS ${ECCODES_EXTRA_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} ${AEC_LIBRARIES} ${PNG_LIBRARIES}
PUBLIC_LIBS ${CMATH_LIBRARIES} ${THREADS_LIBRARIES}
TEMPLATES ${eccodes_extra_src_files}

2
src/grib_accessor_class_data_png_packing.c
View File

@ -187,7 +187,7 @@ static int value_count(grib_accessor* a, long* n_vals)
#if HAVE_LIBPNG
#include "png.h"
#include <png.h>
typedef struct png_read_callback_data
{