Update to new cmake parameters