diff --git a/CMakeLists.txt b/CMakeLists.txt index f42fbe3f7..befa94ed7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -25,8 +25,8 @@ set(PACKAGE "netCDF" CACHE STRING "") ##### SET(NC_VERSION_MAJOR 4) -SET(NC_VERSION_MINOR 4) -SET(NC_VERSION_PATCH 2) +SET(NC_VERSION_MINOR 5) +SET(NC_VERSION_PATCH 0) SET(NC_VERSION_NOTE "-development") SET(netCDF_VERSION ${NC_VERSION_MAJOR}.${NC_VERSION_MINOR}.${NC_VERSION_PATCH}${NC_VERSION_NOTE}) SET(VERSION ${netCDF_VERSION}) @@ -645,7 +645,7 @@ IF(USE_HDF5 OR ENABLE_NETCDF_4) SET(HDF5_C_LIBRARY hdf5) ENDIF() ENDIF(HDF5_C_LIBRARY AND HDF5_HL_LIBRARY AND HDF5_INCLUDE_DIR) - + # There is a missing case in the above code so default it IF("${HDF5_C_LIBRARY_hdf5}" STREQUAL "" ) SET(HDF5_C_LIBRARY_hdf5 "${HDF5_C_LIBRARY}") diff --git a/configure.ac b/configure.ac index 7a780ed1b..92349ccf1 100644 --- a/configure.ac +++ b/configure.ac @@ -15,7 +15,7 @@ AC_REVISION([$Id: configure.ac,v 1.450 2010/05/28 19:42:47 dmh Exp $]) AC_PREREQ([2.59]) # Initialize with name, version, and support email address. -AC_INIT([netCDF], [4.4.2-development], [support-netcdf@unidata.ucar.edu]) +AC_INIT([netCDF], [4.5.0-development], [support-netcdf@unidata.ucar.edu]) ## # Prefer an empty CFLAGS variable instead of the default -g -O2. @@ -25,8 +25,8 @@ AC_INIT([netCDF], [4.4.2-development], [support-netcdf@unidata.ucar.edu]) : ${CFLAGS=""} AC_SUBST([NC_VERSION_MAJOR]) NC_VERSION_MAJOR=4 -AC_SUBST([NC_VERSION_MINOR]) NC_VERSION_MINOR=4 -AC_SUBST([NC_VERSION_PATCH]) NC_VERSION_PATCH=2 +AC_SUBST([NC_VERSION_MINOR]) NC_VERSION_MINOR=5 +AC_SUBST([NC_VERSION_PATCH]) NC_VERSION_PATCH=0 AC_SUBST([NC_VERSION_NOTE]) NC_VERSION_NOTE="-development" ##### diff --git a/ncdump/Makefile.am b/ncdump/Makefile.am index 80215d266..991b3c6ff 100644 --- a/ncdump/Makefile.am +++ b/ncdump/Makefile.am @@ -171,7 +171,14 @@ SUBDIRS=cdl expected EXTRA_DIST += tst_ncgen_shared.sh tst_ncgen4.sh tst_ncgen4_classic.sh \ tst_ncgen4_diff.sh tst_ncgen4_cycle.sh ref_ctest.c ref_ctest64.c -CLEANFILES += results/*.nc results/*.dmp results/*.dmp2 tmp*.cdl tst_bug324.nc +CLEANFILES += results/*.nc results/*.dmp results/*.dmp2 tmp*.cdl \ + c5.nc compound_datasize_test.nc compound_datasize_test2.nc \ + ncf199.nc ref_camrun.c tst_c0.cdl tst_c0_4.cdl tst_c0_4c.cdl \ + tst_c0_64.cdl tst_compound_datasize_test.cdl \ + tst_compound_datasize_test2.cdl tst_gattenum.nc \ + tst_ncf199.cdl tst_tst_gattenum.cdl tst_tst_usuffix.cdl \ + tst_usuffix.nc tst_bug324.nc + DISTCLEANFILES = results clean-local: