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

More cleaning up of configuration status messages.

Browse Source
This commit is contained in:
Ward Fisher 2015-11-17 17:14:22 -07:00
parent d72b108494
commit 05034bfd57
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
CMakeLists.txt
View File

@ -454,7 +454,6 @@ IF(ENABLE_NETCDF_4)
SET(USE_NETCDF4 ON CACHE BOOL "")
SET(ENABLE_NETCDF_4 ON CACHE BOOL "")
SET(ENABLE_NETCDF4 ON CACHE BOOL "")
ENDIF()
# Option for building RPC
@ -506,6 +505,8 @@ IF(USE_HDF5 OR ENABLE_NETCDF_4)
CHECK_LIBRARY_EXISTS(hdf5 H5Pget_fapl_mpio "" HDF5_IS_PARALLEL_MPIO)
IF(HDF5_IS_PARALLEL_MPIPOSIX OR HDF5_IS_PARALLEL_MPIO)
SET(HDF5_IS_PARALLEL ON)
ELSE()
SET(HDF5_IS_PARALLEL OFF)
ENDIF()
IF(HDF5_IS_PARALLEL_MPIO)
@ -1604,7 +1605,7 @@ is_enabled(ENABLE_NETCDF_4 HAS_HDF5)
is_enabled(USE_SZIP HAS_SZIP)
is_enabled(STATUS_PNETCDF HAS_PNETCDF)
is_enabled(STATUS_PARALLEL HAS_PARALLEL)
is_enabled(HDF5_IS_PARALLEL HAS_PARALLEL4)
is_enabled(ENABLE_PARALLEL4 HAS_PARALLEL4)
is_enabled(USE_DAP HAS_DAP)
is_enabled(USE_DISKLESS HAS_DISKLESS)
is_enabled(USE_MMAP HAS_MMAP)

13
configure.ac
View File

@ -929,8 +929,10 @@ if test "x$enable_netcdf_4" = xyes; then
# The user may have built HDF5 with the SZLIB library.
if test "x$ac_cv_func_H5Z_SZIP" = xyes; then
AC_SEARCH_LIBS([SZ_Compress], [szip sz], [], [])
AC_SEARCH_LIBS([SZ_Compress], [szip sz], [], [])
AC_DEFINE([USE_SZIP], [1], [if true, compile in szip compression in netCDF-4 variables])
else
AC_DEFINE([USE_SZIP], [0], [if true, compile in szip compression in netCDF-4 variables])
fi
if test "x$ac_cv_func_H5free_memory" = xyes; then
@ -960,9 +962,9 @@ fi
# Should we suppress parallel io for netcdf-4?
if test "x$enable_netcdf_4" = xyes ; then
AC_MSG_CHECKING([whether parallel I/O is enabled for netcdf-4])
AC_ARG_ENABLE([parallel4], [AS_HELP_STRING([--disable-parallel4],
[disable parallel I/O for netcdf-4, even if it's enabled in libhdf5])])
AC_MSG_CHECKING([whether parallel I/O is enabled for netcdf-4])
AC_ARG_ENABLE([parallel4], [AS_HELP_STRING([--disable-parallel4],
[disable parallel I/O for netcdf-4, even if it's enabled in libhdf5] )])
test "x$enable_parallel4" = xno || enable_parallel4=yes
AC_MSG_RESULT($enable_parallel4)
else
@ -1199,12 +1201,11 @@ if test "x$enable_jna" = xyes ; then
AC_DEFINE([JNA], [1], [if true, include JNA bug fix])
fi
AC_SUBST(NC_LIBS,[$NC_LIBS])
AC_SUBST(HAS_DAP,[$enable_dap])
AC_SUBST(HAS_NC2,[$nc_build_v2])
AC_SUBST(HAS_NC4,[$enable_netcdf_4])
AC_SUBST(HAS_SZIP,[$ac_cv_func_H5Z_SZIP])
AC_SUBST(HAS_SZIP,[$USE_SZIP])
AC_SUBST(HAS_HDF4,[$enable_hdf4])
AC_SUBST(HAS_PNETCDF,[$enable_pnetcdf])
AC_SUBST(HAS_HDF5,[$enable_netcdf_4])

2
libnetcdf.settings.in
View File

@ -25,10 +25,8 @@ Extra libraries: @LIBS@
# Features
--------
NetCDF-2 API: @HAS_NC2@
CDF-5 Support: yes
HDF4 Support: @HAS_HDF4@
NetCDF-4 API: @HAS_NC4@
HDF5/SZIP Support: @HAS_SZIP@
NC-4 Parallel Support: @HAS_PARALLEL4@
PNetCDF Support: @HAS_PNETCDF@
DAP Support: @HAS_DAP@