Switched back to a proper cmake system