Update CMakeFiles
Merge branch 'master' of github.com:hpicgs/glow