Merged latest from CMake branche.

Fixed an error on very small files (< 4 bytes) that was only occuring on sol. Updated CMake configuration file.




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