fixed up files in cmake system for 1.3 branch #869