Managed to get cmake working
Managed to get cmake working
More cmake fixes