fix build
Merge branch 'cmake' of github.com:drussel/cinder into cmake