updated cmake to work with new system