Added back removed cmake change in past commit
Fixed cmake typos