added stuff for future cmake build
fixed cmake build