Cleaned up CMake configuration file a little bit.
Merge branch 'master' of https://github.com/Unidata/netcdf-c