Manually merging cmake support
Manually merging cmake support