Merging latest changes from cmake branch into trunk.


git-svn-id: https://sub.unidata.ucar.edu/netcdf/trunk@3280 2e3060e4-1ed8-cf1f-9cc2-9586e844a556