Continue migration to cmake