Update for CMake
Merge pull request #351 from nexusformat/development

Update for CMake