Fix cmake build
Merge pull request #864 from ricnewton/master

Fix cmake build