Fixed cmake syntax and style issues