mirror/netcdf-c
2
0
Fork 0
mirror of https://github.com/Unidata/netcdf-c.git synced 2025-02-17 16:50:18 +08:00
Code Issues Packages Projects Releases Wiki Activity

Wired logging status into nc-config generated by cmake.

Browse Source
This commit is contained in:
Ward Fisher 2016-02-29 11:32:26 -07:00
parent 6f06fb71da
commit 2206527ba5
3 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure.ac
View File

@ -1209,7 +1209,7 @@ AC_SUBST(HAS_HDF4,[$enable_hdf4])
AC_SUBST(HAS_PNETCDF,[$enable_pnetcdf])
AC_SUBST(HAS_HDF5,[$enable_netcdf_4])
AC_SUBST(HAS_LOGGING, [$enable_logging])
AC_SUBST(HAS_SZLIB,[$nc_has_szlib])
AC_SUBST(HAS_SZLIB,[$ac_cv_func_H4Z_SZIP])
AC_SUBST(HAS_PARALLEL,[$enable_parallel])
AC_SUBST(HAS_PARALLEL4,[$enable_parallel4])
AC_SUBST(HAS_DISKLESS,[$enable_diskless])

7
nc-config.cmake.in
View File

@ -35,6 +35,13 @@ else
has_nc4="yes"
fi
has_logging="@ENABLE_LOGGING@"
if [ -z $has_logging ]; then
has_logging="no"
else
has_logging="yes"
fi
has_hdf4="@USE_HDF4@"
if [ -z $has_hdf4 ]; then
has_hdf4="no"

1
nc-config.in
View File

@ -8,6 +8,7 @@ prefix=@prefix@
exec_prefix=${prefix}
includedir=${prefix}/include
cc="@CC@"
cflags=" -I${includedir} @CPPFLAGS@"
has_dap="@HAS_DAP@"