Fix the cmake build
Merge pull request #535 from xyz32/fix-cmake-build

Fix the cmake build