improve cmake support
Merge branch 'master' into develop