Fixed cmake syntax errors
Merge remote-tracking branch 'devel/update_icon' into devel-master